Mercurial > hg > truffle
comparison make/windows/makefiles/vm.make @ 9159:43223d3f5dcd
Merge with hsx/hotspot-comp
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Tue, 16 Apr 2013 17:39:46 +0200 |
parents | b9a918201d47 f36e073d56a4 |
children | 836a62f43af9 |
comparison
equal
deleted
inserted
replaced
9158:9d74a0d7b231 | 9159:43223d3f5dcd |
---|---|
29 | 29 |
30 COMMONSRC=$(WorkSpace)\src | 30 COMMONSRC=$(WorkSpace)\src |
31 ALTSRC=$(WorkSpace)\src\closed | 31 ALTSRC=$(WorkSpace)\src\closed |
32 | 32 |
33 !ifdef RELEASE | 33 !ifdef RELEASE |
34 !ifdef DEVELOP | |
35 CXX_FLAGS=$(CXX_FLAGS) /D "DEBUG" | |
36 !else | |
37 CXX_FLAGS=$(CXX_FLAGS) /D "PRODUCT" | 34 CXX_FLAGS=$(CXX_FLAGS) /D "PRODUCT" |
38 !endif | |
39 !else | 35 !else |
40 CXX_FLAGS=$(CXX_FLAGS) /D "ASSERT" | 36 CXX_FLAGS=$(CXX_FLAGS) /D "ASSERT" |
41 !endif | 37 !endif |
42 | 38 |
43 !if "$(Variant)" == "core" | 39 !if "$(Variant)" == "core" |
189 | 185 |
190 VM_PATH={$(VM_PATH)} | 186 VM_PATH={$(VM_PATH)} |
191 | 187 |
192 # Special case files not using precompiled header files. | 188 # Special case files not using precompiled header files. |
193 | 189 |
194 c1_RInfo_$(Platform_arch).obj: $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp | 190 c1_RInfo_$(Platform_arch).obj: $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp |
195 $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp | 191 $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp |
196 | 192 |
197 os_windows.obj: $(WorkSpace)\src\os\windows\vm\os_windows.cpp | 193 os_windows.obj: $(WorkSpace)\src\os\windows\vm\os_windows.cpp |
198 $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\os_windows.cpp | 194 $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\os_windows.cpp |
199 | 195 |