Log Message:
-----------
Update configuration for wxWidgets 2.5.4, and PostgreSQL 8.0 (pgInstaller)
libpq.
Modified Files:
--------------
pgadmin3/src:
pgAdmin3.dsp (r1.121 -> r1.122)
Index: pgAdmin3.dsp
===================================================================
RCS file: /projects/pgadmin3/src/pgAdmin3.dsp,v
retrieving revision 1.121
retrieving revision 1.122
diff -Lsrc/pgAdmin3.dsp -Lsrc/pgAdmin3.dsp -u -w -r1.121 -r1.122
--- src/pgAdmin3.dsp
+++ src/pgAdmin3.dsp
@@ -45,18 +45,18 @@
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include/" /I
"c:/wxWidgets-2.5.3/include" /I "c:/wxWidgets-2.5.3/contrib/include" /I
"c:/wxWidgets-2.5.3/lib/mswd" /I "c:/postgresql/include" /D "WIN32" /D "_DEBUG"
/D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D
"__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D wxUSE_UNICODE=1 /D
"_UNICODE" /D "UNICODE" /FAcs /FR /FD /c
# SUBTRACT BASE CPP /YX /Yc /Yu
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "c:/wxWidgets-2.5.3/include" /I
"c:/wxWidgets-2.5.3/contrib/include" /I "c:/postgresql/include" /I "include/"
/I "agent/include" /I "slony/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D
"__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D
"__WIN32__" /D WINVER=0x0400 /D "STRICT" /D wxUSE_UNICODE=1 /D "_UNICODE" /D
"UNICODE" /D "SSL" /FAcs /Yu"pgadmin3.h" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "c:/wxWidgets-2.5.4/include" /I
"c:/wxWidgets-2.5.4/contrib/include" /I "c:/program
files/postgresql/8.0/include" /I "include/" /I "agent/include" /I
"slony/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D
"__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D
WINVER=0x0400 /D "STRICT" /D wxUSE_UNICODE=1 /D "_UNICODE" /D "UNICODE" /D
"SSL" /FAcs /Yu"pgadmin3.h" /FD /c
# SUBTRACT CPP /Fr
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x809 /i "c:/wxWidgets-2.5.3/include" /i
"c:/wxWidgets-2.5.3/contrib/include" /d "_DEBUG"
-# ADD RSC /l 0x809 /i "c:/wxWidgets-2.5.3/include" /d "_DEBUG"
+# ADD RSC /l 0x809 /i "c:/wxWidgets-2.5.4/include" /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswud.lib pngd.lib
zlibd.lib jpegd.lib tiffd.lib stcd.lib libpq.lib wxxrcd.lib regexd.lib /nologo
/subsystem:windows /map /debug /machine:I386 /nodefaultlib:"libcd.lib"
/nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept
/libpath:"c:/wxWidgets-2.5.3/lib" /libpath:"c:/wxWidgets-2.5.3/contrib/lib"
/libpath:"c:/postgresql/lib"
-# ADD LINK32 libpq.lib wxbase25ud.lib wxbase25ud_xml.lib wxbase25ud_net.lib
wxmsw25ud_adv.lib wxmsw25ud_core.lib wxmsw25ud_html.lib wxregexud.lib
wxpngd.lib wxzlibd.lib wxjpegd.lib wxtiffd.lib wxmsw25ud_stc.lib
wxmsw25ud_xrc.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib uuid.lib comctl32.lib rpcrt4.lib
wsock32.lib winmm.lib ole32.lib oleaut32.lib /nologo /subsystem:windows /map
/debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib"
/nodefaultlib:"msvcrt.lib" /pdbtype:sept
/libpath:"c:/wxWidgets-2.5.3/lib/vc_lib" /libpath:"c:/postgresql/lib"
+# ADD LINK32 libpq.lib wxbase25ud.lib wxbase25ud_xml.lib wxbase25ud_net.lib
wxmsw25ud_adv.lib wxmsw25ud_core.lib wxmsw25ud_html.lib wxregexud.lib
wxpngd.lib wxzlibd.lib wxjpegd.lib wxtiffd.lib wxmsw25ud_stc.lib
wxmsw25ud_xrc.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib uuid.lib comctl32.lib rpcrt4.lib
wsock32.lib winmm.lib ole32.lib oleaut32.lib /nologo /subsystem:windows /map
/debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib"
/nodefaultlib:"msvcrt.lib" /pdbtype:sept
/libpath:"c:/wxWidgets-2.5.4/lib/vc_lib" /libpath:"c:/program
files/postgresql/8.0/lib/ms"
!ELSEIF "$(CFG)" == "pgAdmin3 - Win32 Unicode SSL Release"
@@ -73,18 +73,18 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /GX /O2 /Ob2 /I "include/" /I
"c:/wxWidgets-2.5.3/include" /I "c:/wxWidgets-2.5.3/contrib/include" /I
"c:/wxWidgets-2.5.3/lib/mswd" /I "c:/postgresql/include" /D "NDEBUG" /D "WIN32"
/D "_WINDOWS" /D "__WINDOWS__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400
/D "STRICT" /D wxUSE_UNICODE=1 /D "_UNICODE" /D "UNICODE" /D "EMBED_XRC" /FAcs
/FR /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /O2 /Ob2 /I "c:/wxWidgets-2.5.3/include" /I
"c:/wxWidgets-2.5.3/contrib/include" /I "c:/postgresql/include" /I "include/"
/I "agent/include" /I "slony/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D
"__WINDOWS__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D
wxUSE_UNICODE=1 /D "_UNICODE" /D "UNICODE" /D "EMBED_XRC" /D "SSL" /FAcs /FR
/Yu"pgadmin3.h" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /O2 /Ob2 /I "c:/wxWidgets-2.5.4/include" /I
"c:/wxWidgets-2.5.4/contrib/include" /I "c:/program
files/postgresql/8.0/include" /I "include/" /I "agent/include" /I
"slony/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D
"__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D wxUSE_UNICODE=1 /D
"_UNICODE" /D "UNICODE" /D "EMBED_XRC" /D "SSL" /FAcs /FR /Yu"pgadmin3.h" /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x809 /i "c:/wxWidgets-2.5.3/include" /i
"c:/wxWidgets-2.5.3/contrib/include" /d "NDEBUG"
-# ADD RSC /l 0x809 /i "c:/wxWidgets-2.5.3/include" /d "NDEBUG"
+# ADD RSC /l 0x809 /i "c:/wxWidgets-2.5.4/include" /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswu.lib png.lib
zlib.lib jpeg.lib tiff.lib stc.lib libpq.lib wxxrc.lib regex.lib /nologo
/subsystem:windows /map /machine:I386 /nodefaultlib:"libcd.lib"
/nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /pdbtype:sept
/libpath:"c:/wxWidgets-2.5.3/lib" /libpath:"c:/wxWidgets-2.5.3/contrib/lib"
/libpath:"c:/postgresql/lib"
# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 libpq.lib wxbase25u.lib wxbase25u_xml.lib wxbase25u_net.lib
wxmsw25u_adv.lib wxmsw25u_core.lib wxmsw25u_html.lib wxregexu.lib wxpng.lib
wxzlib.lib wxjpeg.lib wxtiff.lib wxmsw25u_stc.lib wxmsw25u_xrc.lib wxexpat.lib
kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib ole32.lib
oleaut32.lib /nologo /subsystem:windows /map /machine:I386
/nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib"
/nodefaultlib:"msvcrtd.lib" /pdbtype:sept
/libpath:"c:/wxWidgets-2.5.3/lib/vc_lib" /libpath:"c:/postgresql/lib"
+# ADD LINK32 libpq.lib wxbase25u.lib wxbase25u_xml.lib wxbase25u_net.lib
wxmsw25u_adv.lib wxmsw25u_core.lib wxmsw25u_html.lib wxregexu.lib wxpng.lib
wxzlib.lib wxjpeg.lib wxtiff.lib wxmsw25u_stc.lib wxmsw25u_xrc.lib wxexpat.lib
kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib ole32.lib
oleaut32.lib /nologo /subsystem:windows /map /machine:I386
/nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib"
/nodefaultlib:"msvcrtd.lib" /pdbtype:sept
/libpath:"c:/wxWidgets-2.5.4/lib/vc_lib" /libpath:"c:/program
files/postgresql/8.0/lib/ms"
# SUBTRACT LINK32 /pdb:none
!ENDIF
---------------------------(end of broadcast)---------------------------
TIP 1: subscribe and unsubscribe commands go to [EMAIL PROTECTED]
