Mercurial > hg > truffle

comparison make/windows/makefiles/vm.make @ 15280:417e2ae45b89

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Michael Van De Vanter <michael.van.de.vanter@oracle.com>
date Tue, 22 Apr 2014 18:22:40 -0700
parents cc844a4512f1
children be896a1983c0
comparison
equal deleted inserted replaced
15279:0c6d8a08e31b 15280:417e2ae45b89
68 68
69 CXX_FLAGS=$(CXX_FLAGS) $(CXX_INCLUDE_DIRS) 69 CXX_FLAGS=$(CXX_FLAGS) $(CXX_INCLUDE_DIRS)
70 70
71 # Define that so jni.h is on correct side 71 # Define that so jni.h is on correct side
72 CXX_FLAGS=$(CXX_FLAGS) /D "_JNI_IMPLEMENTATION_" 72 CXX_FLAGS=$(CXX_FLAGS) /D "_JNI_IMPLEMENTATION_"
73
74 !if "$(INCLUDE_GRAAL)" == "true"
75 CXX_FLAGS=$(CXX_FLAGS) /D "GRAAL_VERSION=\"$(GRAAL_VERSION)\""
76 !endif
73 77
74 !if "$(BUILDARCH)" == "ia64" 78 !if "$(BUILDARCH)" == "ia64"
75 STACK_SIZE="/STACK:1048576,262144" 79 STACK_SIZE="/STACK:1048576,262144"
76 !else 80 !else
77 STACK_SIZE= 81 STACK_SIZE=