diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2009-07-06 14:40:18 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2009-07-06 14:40:18 +0000 |
| commit | fc2d14be59dbc93b2e1916052e1e0e383825f1f5 (patch) | |
| tree | 7d48dbacad8f77ee49a88afcb4606d91c2b76f08 /odk/settings | |
| parent | 468a18eea90174305e33a8d9935bad72b1f89c76 (diff) | |
CWS-TOOLING: integrate CWS sdk311_DEV300
2009-06-09 10:22:56 +0200 jsc r272754 : #i101883# adapt number
2009-06-03 13:25:57 +0200 jsc r272559 : #i101883# ensure correct archive name for sdk, adapt resolve_variables_in_downloadname to exchange packageversion
2009-06-03 13:20:14 +0200 jsc r272558 : #i101883# ensure correct archive or package name
2009-06-02 14:56:40 +0200 jsc r272506 : #i101883# ensure correct archive or package name
2009-05-27 11:26:35 +0200 jsc r272337 : CWS-TOOLING: rebase CWS sdk311 to branches/OOO310@272261 (milestone: OOO310:m12)
2009-05-26 15:15:13 +0200 jsc r272305 : #i101883# ifdef links to URE libs for MacOSX and adapt compiler settings
Diffstat (limited to 'odk/settings')
| -rw-r--r-- | odk/settings/settings.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index 350a78c152d2..7f6d408592f4 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -216,7 +216,7 @@ endif COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) -M $(PRJ)/settings/component.uno.map EXE_LINK_FLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -Bdirect -z defs -LINK_LIBS=-L$(OUT)/lib -L$(OO_SDK_OUT)/$(PLATFORM)/lib -L"$(OO_SDK_URE_LIB_DIR)" +LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)" LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)" ifeq "$(PROCTYPE)" "sparc64" @@ -362,7 +362,7 @@ COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) -Wl,--version-script,$(PRJ)/settings/compo #EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -Wl,-export-dynamic -Wl,-z,defs -Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -Wl,-export-dynamic -Wl,-z,defs -Wl,--no-whole-archive -LINK_LIBS=-L$(OUT)/lib -L$(OO_SDK_OUT)/$(PLATFORM)/lib -L"$(OO_SDK_URE_LIB_DIR)" +LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)" LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)" ifneq "$(OO_SDK_URE_HOME)" "" @@ -570,7 +570,7 @@ COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) -Wl,--version-script,$(PRJ)/settings/compo EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined #EXE_LINK_FLAGS+=-Wl,-export-dynamic -Wl,-z,defs -LINK_LIBS=-L$(OUT)/lib -L$(OO_SDK_OUT)/$(PLATFORM)/lib -L"$(OO_SDK_URE_LIB_DIR)" $(PTHREAD_LIBS) +LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)" $(PTHREAD_LIBS) LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)" ifneq "$(OO_SDK_URE_HOME)" "" |