Skip to content

C
core
Kaydet (Commit) 3aaa8204 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

tdf#91966: In SDK, set CPPU_ENV=mscx for 64-bit Windows 

Change-Id: Ib93b2db40f43f98d8369cb91ca35692cc92f023b
üst bb081667
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 2 deletions
odk/settings/settings.mk
Dosyayı görüntüle @ 3aaa8204
...@@ -113,8 +113,14 @@ SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" -I"$(OO_SDK_JAVA_HOME)/inclu ...@@ -113,8 +113,14 @@ SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" -I"$(OO_SDK_JAVA_HOME)/inclu
# define for used compiler necessary for UNO # define for used compiler necessary for UNO
# -DCPPU_ENV=msci -- windows msvc 4.x - 7.x # -DCPPU_ENV=msci -- windows msvc 4.x - 7.x
CC_DEFINES_JNI=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=msci ifeq "$(PROCTYPE)" "x86_64"
CC_DEFINES=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=msci CPPU_ENV=mscx
else
CPPU_ENV=msci
endif
CC_DEFINES_JNI=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=$(CPPU_ENV)
CC_DEFINES=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=$(CPPU_ENV)
CC_OUTPUT_SWITCH=-Fo CC_OUTPUT_SWITCH=-Fo
LIBO_SDK_LDFLAGS_STDLIBS = $(LIBO_SDK_DETAIL_LDFLAGS_MSVCRT) kernel32.lib LIBO_SDK_LDFLAGS_STDLIBS = $(LIBO_SDK_DETAIL_LDFLAGS_MSVCRT) kernel32.lib
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment