[MINGW]

[reactos.git] / reactos / Makefile

diff --git a/reactos/Makefile b/reactos/Makefile
index a2a1847..cf320c4 100644 (file)
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -46,6 +46,10 @@
 #        This is faster than the depends target which does a complete dependency
 #        check of the ReactOS codebase.
 #
+#    bootcdregtest
+#        This target builds an ISO (ReactOS-RegTest.ISO) which is used for unattended
+#        regression testing.
+#
 #
 # Accepted environment variables:
 #
@@ -169,11 +173,7 @@ else
 endif
 
 ifeq ($(ROS_AUTOMAKE),)
-  ifeq ($(ARCH),i386)
-    ROS_AUTOMAKE=makefile.auto
-  else
-    ROS_AUTOMAKE=makefile-$(ARCH).auto
-  endif
+  ROS_AUTOMAKE=makefile-$(ARCH).auto
 endif
 
 all: $(ROS_AUTOMAKE)
@@ -353,6 +353,7 @@ ifeq ($(HOST),mingw32-linux)
        endif
        export SEP = /
        mkdir = -$(Q)mkdir -p
+       checkpoint = $(Q)touch
        rm = $(Q)rm -f
        cp = $(Q)cp
        NUL = /dev/null
@@ -361,6 +362,7 @@ else # mingw32-windows
        ROS_EMPTY =
        export SEP = \$(ROS_EMPTY)
        mkdir = -$(Q)mkdir
+       checkpoint = $(Q)copy /y NUL
        rm = $(Q)del /f /q
        cp = $(Q)copy /y
        NUL = NUL
@@ -474,11 +476,6 @@ rgenstat: $(RGENSTAT_TARGET)
        $(ECHO_RGENSTAT)
        $(Q)$(RGENSTAT_TARGET) apistatus.lst apistatus.xml
 
-.PHONY: cb
-cb: $(ROS_BUILDENGINE)
-       $(ECHO_RBUILD)
-       $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) cb
-
 .PHONY: msbuild
 msbuild: $(ROS_BUILDENGINE)
        $(ECHO_RBUILD)
@@ -529,6 +526,11 @@ msvc9: $(ROS_BUILDENGINE)
        $(ECHO_RBUILD)
        $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs9.00 -voversionconfiguration msvc
 
+.PHONY: msvc10
+msvc10: $(ROS_BUILDENGINE)
+       $(ECHO_RBUILD)
+       $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs10.00 -voversionconfiguration msvc
+
 .PHONY: msvc6_clean
 msvc6_clean: $(ROS_BUILDENGINE)
        $(ECHO_RBUILD)
@@ -554,6 +556,11 @@ msvc9_clean: $(ROS_BUILDENGINE)
        $(ECHO_RBUILD)
        $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs9.00 -voversionconfiguration msvc
 
+.PHONY: msvc10_clean
+msvc10_clean: $(ROS_BUILDENGINE)
+       $(ECHO_RBUILD)
+       $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs10.00 -voversionconfiguration msvc
+
 .PHONY: msvc_clean
 msvc_clean: $(ROS_BUILDENGINE)
        $(ECHO_RBUILD)