diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-06-10 09:51:12 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-06-10 09:51:12 +0000 |
| commit | fbd7b2d74352a20199b00010bee0fae082dcb2b1 (patch) | |
| tree | 4b5a978b3e28961f55a8a440fbf8e6e73c5f2078 /odk/settings | |
| parent | bb232b4e7b7dca191db23f969c42f6497325ddb8 (diff) | |
INTEGRATION: CWS sdk02 (1.4.6); FILE MERGED
2003/06/05 11:25:48 jsc 1.4.6.3: #108987# change include to stl
2003/05/23 16:33:11 jsc 1.4.6.2: #109045# insert CYGWIN 5.1 check
2003/05/14 11:04:22 jsc 1.4.6.1: #109045# insert JAVAC_FLAGS option
Diffstat (limited to 'odk/settings')
| -rw-r--r-- | odk/settings/settings.mk | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index 4ac002c8d959..63485e13c95a 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -17,6 +17,9 @@ endif ifeq "$(PLATFORM)" "CYGWIN_NT-5.0" PLATFORM = windows endif +ifeq "$(PLATFORM)" "CYGWIN_NT-5.1" +PLATFORM = windows +endif endif # debug option, default is no debug @@ -25,6 +28,17 @@ ifeq "$(MAKECMDGOALS)" "debug" DEBUG=yes endif +########################################################################### +# +# Java settings +# +########################################################################### +JAVAC_FLAGS= + +ifeq "$(DEBUG)" "yes" +JAVAC_FLAGS+=-g +endif + ########################################################################### # @@ -70,13 +84,13 @@ EMPTYSTRING= PATH_SEPARATOR=; # use this for release version -CC_FLAGS=-c -GX +CC_FLAGS=-c -GX -MT ifeq "$(DEBUG)" "yes" -CC_FLAGS+=-Zi -MT +CC_FLAGS+=-Zi endif CC_INCLUDES=-I. -I$(OUT)/inc/examples -I$(PRJ)/include -STL_INCLUDES=-I$(OO_STLPORT_HOME)/stlport +STL_INCLUDES=-I$(OO_SDK_HOME)/include/stl SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -I$(OO_SDK_JAVA_HOME)/include/win32 # define for used compiler necessary for UNO @@ -158,7 +172,7 @@ ifeq "$(DEBUG)" "yes" CC_FLAGS+=-g endif CC_INCLUDES=-I. -I/usr/include -I$(OUT)/inc/examples -I$(PRJ)/include -STL_INCLUDES=-I$(OO_STLPORT_HOME)/stlport +STL_INCLUDES=-I$(OO_SDK_HOME)/include/stl SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -I$(OO_SDK_JAVA_HOME)/include/solaris # define for used compiler necessary for UNO @@ -254,7 +268,7 @@ endif SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -I$(OO_SDK_JAVA_HOME)/include/linux CC_INCLUDES=-I. -I/usr/include -I$(OUT)/inc/examples -I$(PRJ)/include -STL_INCLUDES=-I$(OO_STLPORT_HOME)/stlport +STL_INCLUDES=-I$(OO_SDK_HOME)/include/stl CC_DEFINES=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV) # define for used compiler necessary for UNO |