diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-01-28 15:31:04 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-01-28 15:31:04 +0000 |
| commit | 458ec3ef2c480bf687150faf5aa11a0b3b2d53e1 (patch) | |
| tree | f33f3591019578a1cc60199bf2ff2e9f8c048e84 /odk/settings | |
| parent | f6d98bceaeed87a2569857f6309d0381a3ded2f4 (diff) | |
INTEGRATION: CWS jsc20 (1.26.8); FILE MERGED
2008/01/03 16:01:39 jsc 1.26.8.2: #i80013# adapt link flags to work with URE
2008/01/03 15:25:40 jsc 1.26.8.1: #i80013# use new macro to specify the stlport lib name
Diffstat (limited to 'odk/settings')
| -rw-r--r-- | odk/settings/settings.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index 888ac3921d80..028fe1052c16 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -70,7 +70,7 @@ CPPUHELPERLIB=icppuhelper.lib SALHELPERLIB=isalhelper.lib REGLIB=ireg.lib STORELIB=istore.lib -STLPORTLIB=stlport_vc71.lib +STLPORTLIB=stlport_vc71$(STLDEBUG).lib BLANK= EMPTYSTRING= @@ -177,7 +177,7 @@ CPPUHELPERLIB=-luno_cppuhelperC52 SALHELPERLIB=-luno_salhelperC52 REGLIB=-lreg STORELIB=-lstore -STLPORTLIB=-lstlport_sunpro +STLPORTLIB=-lstlport_sunpro$(STLDEBUG) EMPTYSTRING= PATH_SEPARATOR=: @@ -203,7 +203,7 @@ LIBRARY_LINK_FLAGS+=-instances=static endif COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) -M $(PRJ)/settings/component.uno.map -LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L"$(OFFICE_PROGRAM_PATH)" +LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/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)" "" @@ -292,7 +292,7 @@ STORELIB=-lstore ifeq "$(STLPORT_VER)" "500" STLPORTLIB=-lstlport else -STLPORTLIB=-lstlport_gcc +STLPORTLIB=-lstlport_gcc$(STLDEBUG) endif EMPTYSTRING= @@ -328,7 +328,7 @@ endif COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) -Wl,--version-script,$(PRJ)/settings/component.uno.map EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -Wl,-export-dynamic -Wl,-z,defs -Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive -LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L"$(OFFICE_PROGRAM_PATH)" +LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/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)" "" @@ -394,7 +394,7 @@ STORELIB=-lstore ifeq "$(STLPORT_VER)" "500" STLPORTLIB=-lstlport -lstdc++ else -STLPORTLIB=-lstlport_gcc -lstdc++ +STLPORTLIB=-lstlport_gcc$(STLDEBUG) -lstdc++ endif EMPTYSTRING= @@ -421,7 +421,7 @@ COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) #-Wl,--version-script,$(PRJ)/settings/component.uno.map #EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -Wl,-export-dynamic -Wl,-z,defs -LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L"$(OFFICE_PROGRAM_PATH)" +LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L"$(OO_SDK_URE_LIB_DIR)" LINK_JAVA_LIBS=-framework JavaVM ifneq "$(OO_SDK_URE_HOME)" "" @@ -494,7 +494,7 @@ STORELIB=-lstore ifeq "$(STLPORT_VER)" "500" STLPORTLIB=-lstlport else -STLPORTLIB=-lstlport_gcc +STLPORTLIB=-lstlport_gcc$(STLDEBUG) endif EMPTYSTRING= @@ -519,7 +519,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$(PRJ)/$(PLATFORM)/lib -L"$(OFFICE_PROGRAM_PATH)" $(PTHREAD_LIBS) +LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/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)" "" |