--- old/make/windows/makefiles/vm.make Sat Jun 1 09:41:33 2013 +++ new/make/windows/makefiles/vm.make Sat Jun 1 09:41:32 2013 @@ -31,7 +31,11 @@ ALTSRC=$(WorkSpace)\src\closed !ifdef RELEASE +!ifdef DEVELOP +CXX_FLAGS=$(CXX_FLAGS) /D "DEBUG" +!else CXX_FLAGS=$(CXX_FLAGS) /D "PRODUCT" +!endif !else CXX_FLAGS=$(CXX_FLAGS) /D "ASSERT" !endif @@ -136,6 +140,8 @@ !if "$(USE_PRECOMPILED_HEADER)" != "0" CXX_USE_PCH=/Fp"vm.pch" /Yu"precompiled.hpp" +# VS2012 requires this object file to be listed: +LD_FLAGS=$(LD_FLAGS) _build_pch_file.obj !else CXX_USE_PCH=$(CXX_DONT_USE_PCH) !endif @@ -182,7 +188,7 @@ # Special case files not using precompiled header files. -c1_RInfo_$(Platform_arch).obj: $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp +c1_RInfo_$(Platform_arch).obj: $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp os_windows.obj: $(WorkSpace)\src\os\windows\vm\os_windows.cpp