Add information letting us know creation deletion of services has worked.

[reactos.git] / reactos / Makefile

diff --git a/reactos/Makefile b/reactos/Makefile
index 5cc98f0..593fa3a 100644 (file)
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -115,7 +115,11 @@ all: makefile.auto
 
 ifeq ($(HOST),)
 ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32)
+ifeq ($(OSTYPE),msys)
+HOST=mingw32-linux
+else
 HOST=mingw32-windows
+endif
 else
 HOST=mingw32-linux
 endif
@@ -207,9 +211,13 @@ host_ld = $(Q)ld
 host_ar = $(Q)ar
 host_objcopy = $(Q)objcopy
 ifeq ($(HOST),mingw32-linux)
-       EXEPREFIX = ./
-       EXEPOSTFIX =
-       SEP = /
+       export EXEPREFIX = ./
+ifeq ($(OSTYPE),msys)
+       export EXEPOSTFIX = .exe
+else   
+       export EXEPOSTFIX =
+endif
+       export SEP = /
        mkdir = -$(Q)mkdir -p
        gcc = $(Q)$(PREFIX)-gcc
        gpp = $(Q)$(PREFIX)-g++
@@ -224,10 +232,29 @@ ifeq ($(HOST),mingw32-linux)
        cp = $(Q)cp
        NUL = /dev/null
 else # mingw32-windows
-       EXEPREFIX =
-       EXEPOSTFIX = .exe
+  ifeq ($(OSTYPE),msys)
+       HOST=mingw32-linux
+       export EXEPREFIX = ./
+       export EXEPOSTFIX = .exe
+       export SEP = /
+       mkdir = -$(Q)mkdir -p
+       gcc = $(Q)gcc
+       gpp = $(Q)g++
+       ld = $(Q)ld
+       nm = $(Q)nm
+       objdump = $(Q)objdump
+       ar = $(Q)ar
+       objcopy = $(Q)objcopy
+       dlltool = $(Q)dlltool
+       windres = $(Q)windres
+       rm = $(Q)rm -f
+       cp = $(Q)cp
+       NUL = /dev/null
+  else
+       export EXEPREFIX =
+       export EXEPOSTFIX = .exe
        ROS_EMPTY =
-       SEP = \$(ROS_EMPTY)
+       export SEP = \$(ROS_EMPTY)
        mkdir = -$(Q)mkdir
        gcc = $(Q)gcc
        gpp = $(Q)g++
@@ -241,6 +268,7 @@ else # mingw32-windows
        rm = $(Q)del /f /q
        cp = $(Q)copy /y
        NUL = NUL
+  endif
 endif
 
 ifneq ($(ROS_INTERMEDIATE),)
@@ -290,9 +318,11 @@ ERRCODES_RC = lib$(SEP)kernel32$(SEP)errcodes.rc
 
 include lib/lib.mak
 include tools/tools.mak
+include boot/freeldr/bootsect/bootsect.mak
 -include makefile.auto
 
 PREAUTO := \
+       $(BIN2C_TARGET) \
        $(BIN2RES_TARGET) \
        $(BUILDNO_H) \
        $(BUGCODES_H) \
@@ -306,6 +336,10 @@ makefile.auto: $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES)
        $(ECHO_RBUILD)
        $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) mingw
 
+.PHONY: msvc
+msvc: $(RBUILD_TARGET)
+       $(ECHO_RBUILD)
+       $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) msvc
 
 $(BUGCODES_H) $(BUGCODES_RC): $(WMC_TARGET) $(NTOSKRNL_MC)
        $(ECHO_WMC)
@@ -315,6 +349,26 @@ $(ERRCODES_H) $(ERRCODES_RC): $(WMC_TARGET) $(KERNEL32_MC)
        $(ECHO_WMC)
        $(Q)$(WMC_TARGET) -i -H $(ERRCODES_H) -o $(ERRCODES_RC) $(KERNEL32_MC)
 
+.PHONY: msvc6
+msvc6: $(RBUILD_TARGET)
+       $(ECHO_RBUILD)
+       $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs6.00 msvc
+
+.PHONY: msvc7
+msvc7: $(RBUILD_TARGET)
+       $(ECHO_RBUILD)
+       $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.00 msvc
+
+.PHONY: msvc71
+msvc71: $(RBUILD_TARGET)
+       $(ECHO_RBUILD)
+       $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.10 msvc
+
+.PHONY: msvc8
+msvc8: $(RBUILD_TARGET)
+       $(ECHO_RBUILD)
+       $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs8.00 msvc
+
 .PHONY: makefile_auto_clean
 makefile_auto_clean:
        -@$(rm) makefile.auto $(PREAUTO) 2>$(NUL)