Log Message:
-----------
Remove obsolete configurations. Update for current wxWidgets.
NOTE: you'll probably need to tweak your build enviroment, but this should now be
easier than previously!!
Modified Files:
--------------
pgadmin3/src:
pgAdmin3.dsp (r1.102 -> r1.103)
Index: pgAdmin3.dsp
===================================================================
RCS file: /projects/pgadmin3/src/pgAdmin3.dsp,v
retrieving revision 1.102
retrieving revision 1.103
diff -Lsrc/pgAdmin3.dsp -Lsrc/pgAdmin3.dsp -u -w -r1.102 -r1.103
--- src/pgAdmin3.dsp
+++ src/pgAdmin3.dsp
@@ -17,10 +17,6 @@
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "pgAdmin3 - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "pgAdmin3 - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE "pgAdmin3 - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "pgAdmin3 - Win32 Unicode Release" (based on "Win32 (x86) Application")
!MESSAGE "pgAdmin3 - Win32 Unicode SSL Debug" (based on "Win32 (x86) Application")
!MESSAGE "pgAdmin3 - Win32 Unicode SSL Release" (based on "Win32 (x86) Application")
!MESSAGE
@@ -33,117 +29,7 @@
MTL=midl.exe
RSC=rc.exe
-!IF "$(CFG)" == "pgAdmin3 - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "c:/wxWindows_2.4.0/include" /I
"c:/wxWindows_2.4.0/contrib/include" /I "c:/wxWindows_2.4.0/lib/mswd" /I "include/" /I
"c:/postgresql/include" /I "agent/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D
"__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D
"STRICT" /D "EMBED_XRC" /FAcs /FR /Yu"pgadmin3.h" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /i "c:/wxWindows_2.4.0/include" /i
"c:/wxWindows_2.4.0/contrib/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
wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib stc.lib wxxrc.lib
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 libpq.lib expat.lib /nologo /subsystem:windows /map
/machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib"
/nodefaultlib:"msvcrtd.lib" /libpath:"c:/wxWindows_2.4.0/lib"
/libpath:"c:/wxWindows_2.4.0/contrib/lib" /libpath:"c:/postgresql/lib"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "pgAdmin3 - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX
/FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "c:/wxWindows_2.4.0/include" /I
"c:/wxWindows_2.4.0/contrib/include" /I "c:/wxWindows_2.4.0/lib/mswd" /I "include/" /I
"c:/postgresql/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" /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 /d "_DEBUG"
-# ADD RSC /l 0x809 /i "c:/wxWindows_2.4.0/include" /i
"c:/wxWindows_2.4.0/contrib/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
wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib stcd.lib wxxrcd.lib
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 libpq.lib expatd.lib /nologo /subsystem:windows /map /debug
/machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib"
/nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"c:/wxWindows_2.4.0/lib"
/libpath:"c:/wxWindows_2.4.0/contrib/lib" /libpath:"c:/postgresql/lib"
-
-!ELSEIF "$(CFG)" == "pgAdmin3 - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "pgAdmin3___Win32_Unicode_Debug"
-# PROP BASE Intermediate_Dir "pgAdmin3___Win32_Unicode_Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Unicode_Debug"
-# PROP Intermediate_Dir "Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include/" /I
"c:/wxWindows_2.4.0/include" /I "c:/wxWindows_2.4.0/contrib/include" /I
"c:/wxWindows_2.4.0/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" /FAcs /FR /FD /c
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "c:/wxWindows_2.5/include" /I
"c:/wxWindows_2.5/contrib/include" /I "c:/wxWindows_2.5/lib/mswd" /I "include/" /I
"c:/postgresql/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" /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:/wxWindows_2.4.0/include" /i
"c:/wxWindows_2.4.0/contrib/include" /d "_DEBUG"
-# ADD RSC /l 0x809 /i "c:/wxWindows_2.5/include" /i
"c:/wxWindows_2.5/contrib/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 wxmswd.lib pngd.lib zlibd.lib jpegd.lib
tiffd.lib stcd.lib libpq.lib wxxrcd.lib /nologo /subsystem:windows /map /debug
/machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib"
/nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"c:/wxWindows_2.4.0/lib"
/libpath:"c:/wxWindows_2.4.0/contrib/lib" /libpath:"c:/postgresql/lib"
-# ADD LINK32 wxmswud.lib regexud.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib stcd.lib
wxxrcd.lib 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 libpq.lib expatd.lib /nologo /subsystem:windows /map
/debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib"
/nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"c:/wxWindows_2.5/lib"
/libpath:"c:/wxWindows_2.5/contrib/lib" /libpath:"c:/postgresql/lib"
-
-!ELSEIF "$(CFG)" == "pgAdmin3 - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "pgAdmin3___Win32_Unicode_Release"
-# PROP BASE Intermediate_Dir "pgAdmin3___Win32_Unicode_Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Unicode_Release"
-# PROP Intermediate_Dir "Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include/" /I
"c:/wxWindows_2.5/include" /I "c:/wxWindows_2.5/contrib/include" /I
"c:/wxWindows_2.5/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 /GX /O2 /Ob2 /I "c:/wxWindows_2.5/include" /I
"c:/wxWindows_2.5/contrib/include" /I "c:/wxWindows_2.5/lib/mswd" /I "include/" /I
"c:/postgresql/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" /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:/wxWindows_2.5/include" /i
"c:/wxWindows_2.5/contrib/include" /d "_DEBUG"
-# ADD RSC /l 0x809 /i "c:/wxWindows_2.5/include" /i
"c:/wxWindows_2.5/contrib/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 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:/wxWindows_2.5/lib"
/libpath:"c:/wxWindows_2.5/contrib/lib" /libpath:"c:/postgresql/lib"
-# ADD LINK32 wxmswu.lib png.lib zlib.lib jpeg.lib tiff.lib stc.lib wxxrc.lib
regexu.lib 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 libpq.lib expat.lib /nologo /subsystem:windows /map
/machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib"
/nodefaultlib:"msvcrtd.lib" /pdbtype:sept /libpath:"c:/wxWindows_2.5/lib"
/libpath:"c:/wxWindows_2.5/contrib/lib" /libpath:"c:/postgresql/lib"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF "$(CFG)" == "pgAdmin3 - Win32 Unicode SSL Debug"
+!IF "$(CFG)" == "pgAdmin3 - Win32 Unicode SSL Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -159,17 +45,17 @@
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include/" /I
"c:/wxWindows_2.5/include" /I "c:/wxWindows_2.5/contrib/include" /I
"c:/wxWindows_2.5/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:/wxWindows_2.5/include" /I
"c:/wxWindows_2.5/contrib/include" /I "c:/wxWindows_2.5/lib/mswd" /I "include/" /I
"c:/postgresql/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/include" /I
"c:/wxWidgets/contrib/include" /I "c:/postgresql/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:/wxWindows_2.5/include" /i
"c:/wxWindows_2.5/contrib/include" /d "_DEBUG"
-# ADD RSC /l 0x809 /i "c:/wxWindows_2.5/include" /i
"c:/wxWindows_2.5/contrib/include" /d "_DEBUG"
+# ADD RSC /l 0x809 /i "c:/wxWidgets/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:/wxWindows_2.5/lib"
/libpath:"c:/wxWindows_2.5/contrib/lib" /libpath:"c:/postgresql/lib"
-# ADD LINK32 ssleay32.lib libeay32.lib wxmswud.lib regexud.lib pngd.lib zlibd.lib
jpegd.lib tiffd.lib stcd.lib wxxrcd.lib 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 libpqd.lib expatd.lib
/nologo /subsystem:windows /map /debug /machine:I386 /nodefaultlib:"libcd.lib"
/nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept
/libpath:"c:/wxWindows_2.5/lib" /libpath:"c:/wxWindows_2.5/contrib/lib"
/libpath:"c:/postgresql/lib"
+# ADD LINK32 libpqd.lib ssleay32.lib libeay32.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/lib/vc_lib" /libpath:"c:/postgresql/lib"
!ELSEIF "$(CFG)" == "pgAdmin3 - Win32 Unicode SSL Release"
@@ -186,28 +72,24 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /GX /O2 /Ob2 /I "include/" /I
"c:/wxWindows_2.5/include" /I "c:/wxWindows_2.5/contrib/include" /I
"c:/wxWindows_2.5/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:/wxWindows_2.5/include" /I
"c:/wxWindows_2.5/contrib/include" /I "c:/wxWindows_2.5/lib/mswd" /I "include/" /I
"c:/postgresql/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 CPP /nologo /MDd /W3 /GX /O2 /Ob2 /I "c:/wxWidgets/include" /I
"c:/wxWidgets/contrib/include" /I "c:/postgresql/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:/wxWindows_2.5/include" /i
"c:/wxWindows_2.5/contrib/include" /d "NDEBUG"
-# ADD RSC /l 0x809 /i "c:/wxWindows_2.5/include" /i
"c:/wxWindows_2.5/contrib/include" /d "NDEBUG"
+# ADD RSC /l 0x809 /i "c:/wxWidgets/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:/wxWindows_2.5/lib"
/libpath:"c:/wxWindows_2.5/contrib/lib" /libpath:"c:/postgresql/lib"
# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 ssleay32.lib libeay32.lib wxmswu.lib png.lib zlib.lib jpeg.lib tiff.lib
stc.lib wxxrc.lib regexu.lib 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 libpq.lib expat.lib /nologo
/subsystem:windows /map /machine:I386 /nodefaultlib:"libcd.lib"
/nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /pdbtype:sept
/libpath:"c:/wxWindows_2.5/lib" /libpath:"c:/wxWindows_2.5/contrib/lib"
/libpath:"c:/postgresql/lib"
+# ADD LINK32 libpq.lib ssleay32.lib libeay32.lib wxbase25.lib wxbase25_xml.lib
wxbase25_net.lib wxmsw25_adv.lib wxmsw25_core.lib wxmsw25_html.lib wxregex.lib
wxpng.lib wxzlib.lib wxjpeg.lib wxtiff.lib wxmsw25_stc.lib wxmsw25_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/lib/vc_lib" /libpath:"c:/postgresql/lib"
# SUBTRACT LINK32 /pdb:none
!ENDIF
# Begin Target
-# Name "pgAdmin3 - Win32 Release"
-# Name "pgAdmin3 - Win32 Debug"
-# Name "pgAdmin3 - Win32 Unicode Debug"
-# Name "pgAdmin3 - Win32 Unicode Release"
# Name "pgAdmin3 - Win32 Unicode SSL Debug"
# Name "pgAdmin3 - Win32 Unicode SSL Release"
# Begin Group "src"
@@ -300,23 +182,6 @@
# Begin Source File
SOURCE=.\schema\pgObject.cpp
-
-!IF "$(CFG)" == "pgAdmin3 - Win32 Release"
-
-# ADD CPP /O2
-
-!ELSEIF "$(CFG)" == "pgAdmin3 - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "pgAdmin3 - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "pgAdmin3 - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "pgAdmin3 - Win32 Unicode SSL Debug"
-
-!ELSEIF "$(CFG)" == "pgAdmin3 - Win32 Unicode SSL Release"
-
-!ENDIF
-
# End Source File
# Begin Source File
---------------------------(end of broadcast)---------------------------
TIP 9: the planner will ignore your desire to choose an index scan if your
joining column's datatypes do not match
