Kaydet (Commit) a4845bd7 authored tarafından Fridrich Štrba's avatar Fridrich Štrba

Make link and deliver the postgresql.oxt extension also on windows

üst 91af205a
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
..\%__SRC%\slb\connectivity*.* %_DEST%\lib\connectivity*.* ..\%__SRC%\slb\connectivity*.* %_DEST%\lib\connectivity*.*
..\%__SRC%\lib\idbt* %_DEST%\lib\idbt* ..\%__SRC%\lib\idbt* %_DEST%\lib\idbt*
..\%__SRC%\lib\*.oxt %_DEST%\bin\*.oxt ..\%__SRC%\lib\*.oxt %_DEST%\bin\*.oxt
..\%__SRC%\bin\*.oxt %_DEST%\bin\*.oxt
..\source\cpool\*.xml %_DEST%\xml\*.xml ..\source\cpool\*.xml %_DEST%\xml\*.xml
..\source\drivers\adabas\*.xml %_DEST%\xml\*.xml ..\source\drivers\adabas\*.xml %_DEST%\xml\*.xml
..\source\drivers\ado\*.xml %_DEST%\xml\*.xml ..\source\drivers\ado\*.xml %_DEST%\xml\*.xml
......
...@@ -102,13 +102,13 @@ SHL1VERSIONMAP=$(SOLARENV)$/src$/reg-component.map ...@@ -102,13 +102,13 @@ SHL1VERSIONMAP=$(SOLARENV)$/src$/reg-component.map
# as per instructions in libpq documentation. # as per instructions in libpq documentation.
# If it turns out the rest was needed, reenable it. # If it turns out the rest was needed, reenable it.
.IF "$(SYSTEM_POSTGRESQL)"=="YES" .IF "$(SYSTEM_POSTGRESQL)"=="YES"
.IF "$(GUI)"=="WNT" LIBPQ_LINK=-lpq
LIBPQ_LINK=libpq.lib #wsock32.lib advapi32.lib
.ELSE
LIBPQ_LINK=-lpq #-lcrypt
.ENDIF
.ELSE #SYSTEM_POSTGRESQL==NO .ELSE #SYSTEM_POSTGRESQL==NO
.IF "$(GUI)$(COM)"=="WNTMSC"
LIBPQ_LINK=$(OUTDIR_FOR_BUILD)/lib/libpq.lib ws2_32.lib secur32.lib advapi32.lib shell32.lib
.ELSE
LIBPQ_LINK=$(OUTDIR_FOR_BUILD)/lib/libpq.a LIBPQ_LINK=$(OUTDIR_FOR_BUILD)/lib/libpq.a
.ENDIF
POSTGRESQL_INC=-I$(OUTDIR_FOR_BUILD)/inc/postgresql POSTGRESQL_INC=-I$(OUTDIR_FOR_BUILD)/inc/postgresql
POSTGRESQL_LIB= POSTGRESQL_LIB=
.ENDIF .ENDIF
......
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