SVN Commit by dpage: r4297 - branches/REL-1_2_0_PATCHES/pgadmin3/src

Author: dpage
Date: 2005-06-09 21:55:11 +0100 (Thu, 09 Jun 2005)
New Revision: 4297

Modified:
   branches/REL-1_2_0_PATCHES/pgadmin3/src/pgAdmin3.dsp
Log:
Update for wx 2.6.1 on Win32

Modified: branches/REL-1_2_0_PATCHES/pgadmin3/src/pgAdmin3.dsp
===================================================================
--- branches/REL-1_2_0_PATCHES/pgadmin3/src/pgAdmin3.dsp    2005-06-09 20:48:44 UTC (rev 4296)
+++ branches/REL-1_2_0_PATCHES/pgadmin3/src/pgAdmin3.dsp    2005-06-09 20:55:11 UTC (rev 4297)
@@ -43,19 +43,19 @@
 # PROP Intermediate_Dir "Unicode_SSL_Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include/" /I "c:/wxWidgets-2.6/include" /I
"c:/wxWidgets-2.6/contrib/include"/I "c:/wxWidgets-2.6/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 
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include/" /I "c:/wxWidgets-2.6.1/include" /I
"c:/wxWidgets-2.6.1/contrib/include"/I "c:/wxWidgets-2.6.1/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.6/include" /I "c:/wxWidgets-2.6/contrib/include" /I
"c:/programfiles/postgresql/8.0/include" /I "include/" /I "agent/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 /Fr /Yu"pgadmin3.h" /FD /c 
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "c:/wxWidgets-2.6.1/include" /I "c:/wxWidgets-2.6.1/contrib/include" /I
"c:/programfiles/postgresql/8.0/include" /I "include/" /I "agent/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 /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.6/include" /i "c:/wxWidgets-2.6/contrib/include" /d "_DEBUG"
-# ADD RSC /l 0x809 /i "c:/wxWidgets-2.6/include" /d "_DEBUG"
+# ADD BASE RSC /l 0x809 /i "c:/wxWidgets-2.6.1/include" /i "c:/wxWidgets-2.6.1/contrib/include" /d "_DEBUG"
+# ADD RSC /l 0x809 /i "c:/wxWidgets-2.6.1/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.libuuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswud.lib pngd.lib
zlibd.libjpegd.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.6/lib"/libpath:"c:/wxWidgets-2.6/contrib/lib" /libpath:"c:/postgresql/lib" 
-# ADD LINK32 libpq.lib wxbase26ud.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_core.lib
wxmsw26ud_html.libwxregexud.lib wxpngd.lib wxzlibd.lib wxjpegd.lib wxtiffd.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib
wxexpatd.libkernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib comctl32.lib
rpcrt4.libwsock32.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.6/lib/vc_lib"/libpath:"c:/program files/postgresql/8.0/lib/ms" 
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib
oleaut32.libuuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswud.lib pngd.lib
zlibd.libjpegd.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.6.1/lib"/libpath:"c:/wxWidgets-2.6.1/contrib/lib" /libpath:"c:/postgresql/lib" 
+# ADD LINK32 libpq.lib wxbase26ud.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_core.lib
wxmsw26ud_html.libwxregexud.lib wxpngd.lib wxzlibd.lib wxjpegd.lib wxtiffd.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib
wxexpatd.libkernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib comctl32.lib
rpcrt4.libwsock32.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.6.1/lib/vc_lib"/libpath:"c:/program files/postgresql/8.0/lib/ms" 

 !ELSEIF  "$(CFG)" == "pgAdmin3 - Win32 Unicode SSL Release"

@@ -71,19 +71,19 @@
 # PROP Intermediate_Dir "Unicode_SSL_Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /O2 /Ob2 /I "include/" /I "c:/wxWidgets-2.6/include" /I
"c:/wxWidgets-2.6/contrib/include"/I "c:/wxWidgets-2.6/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.6/include" /I "c:/wxWidgets-2.6/contrib/include" /I
"c:/programfiles/postgresql/8.0/include" /I "include/" /I "agent/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 CPP /nologo /MDd /W3 /GX /O2 /Ob2 /I "include/" /I "c:/wxWidgets-2.6.1/include" /I
"c:/wxWidgets-2.6.1/contrib/include"/I "c:/wxWidgets-2.6.1/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.6.1/include" /I "c:/wxWidgets-2.6.1/contrib/include" /I
"c:/programfiles/postgresql/8.0/include" /I "include/" /I "agent/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.6/include" /i "c:/wxWidgets-2.6/contrib/include" /d "NDEBUG"
-# ADD RSC /l 0x809 /i "c:/wxWidgets-2.6/include" /d "NDEBUG"
+# ADD BASE RSC /l 0x809 /i "c:/wxWidgets-2.6.1/include" /i "c:/wxWidgets-2.6.1/contrib/include" /d "NDEBUG"
+# ADD RSC /l 0x809 /i "c:/wxWidgets-2.6.1/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.libuuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswu.lib png.lib zlib.lib
jpeg.libtiff.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.6/lib"/libpath:"c:/wxWidgets-2.6/contrib/lib" /libpath:"c:/postgresql/lib" 
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib
oleaut32.libuuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswu.lib png.lib zlib.lib
jpeg.libtiff.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.6.1/lib"/libpath:"c:/wxWidgets-2.6.1/contrib/lib" /libpath:"c:/postgresql/lib" 
 # SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 libpq.lib wxbase26u.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_core.lib
wxmsw26u_html.libwxregexu.lib wxpng.lib wxzlib.lib wxjpeg.lib wxtiff.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxexpat.lib
kernel32.libuser32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib comctl32.lib rpcrt4.lib
wsock32.libwinmm.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.6/lib/vc_lib"
/libpath:"c:/programfiles/postgresql/8.0/lib/ms" 
+# ADD LINK32 libpq.lib wxbase26u.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_core.lib
wxmsw26u_html.libwxregexu.lib wxpng.lib wxzlib.lib wxjpeg.lib wxtiff.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxexpat.lib
kernel32.libuser32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib comctl32.lib rpcrt4.lib
wsock32.libwinmm.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.6.1/lib/vc_lib"
/libpath:"c:/programfiles/postgresql/8.0/lib/ms" 
 # SUBTRACT LINK32 /pdb:none

 !ENDIF