equal
deleted
inserted
replaced
90 COPY_DEBUG_SYMBOLS := $(GTEST_COPY_DEBUG_SYMBOLS), \ |
90 COPY_DEBUG_SYMBOLS := $(GTEST_COPY_DEBUG_SYMBOLS), \ |
91 ZIP_EXTERNAL_DEBUG_SYMBOLS := false, \ |
91 ZIP_EXTERNAL_DEBUG_SYMBOLS := false, \ |
92 STRIP_SYMBOLS := false, \ |
92 STRIP_SYMBOLS := false, \ |
93 PRECOMPILED_HEADER := $(JVM_PRECOMPILED_HEADER), \ |
93 PRECOMPILED_HEADER := $(JVM_PRECOMPILED_HEADER), \ |
94 PRECOMPILED_HEADER_EXCLUDE := gtest-all.cc gtestMain.cpp, \ |
94 PRECOMPILED_HEADER_EXCLUDE := gtest-all.cc gtestMain.cpp, \ |
|
95 DEFINE_THIS_FILE := false, \ |
95 )) |
96 )) |
96 |
97 |
97 TARGETS += $(BUILD_GTEST_LIBJVM) |
98 TARGETS += $(BUILD_GTEST_LIBJVM) |
98 |
99 |
99 ################################################################################ |
100 ################################################################################ |
113 LIBS_linux := $(LIBCXX), \ |
114 LIBS_linux := $(LIBCXX), \ |
114 LIBS_unix := -ljvm, \ |
115 LIBS_unix := -ljvm, \ |
115 LIBS_windows := $(JVM_OUTPUTDIR)/gtest/objs/jvm.lib, \ |
116 LIBS_windows := $(JVM_OUTPUTDIR)/gtest/objs/jvm.lib, \ |
116 COPY_DEBUG_SYMBOLS := $(GTEST_COPY_DEBUG_SYMBOLS), \ |
117 COPY_DEBUG_SYMBOLS := $(GTEST_COPY_DEBUG_SYMBOLS), \ |
117 ZIP_EXTERNAL_DEBUG_SYMBOLS := false, \ |
118 ZIP_EXTERNAL_DEBUG_SYMBOLS := false, \ |
|
119 DEFINE_THIS_FILE := false, \ |
118 )) |
120 )) |
119 |
121 |
120 $(BUILD_GTEST_LAUNCHER): $(BUILD_GTEST_LIBJVM) |
122 $(BUILD_GTEST_LAUNCHER): $(BUILD_GTEST_LIBJVM) |
121 |
123 |
122 TARGETS += $(BUILD_GTEST_LAUNCHER) |
124 TARGETS += $(BUILD_GTEST_LAUNCHER) |