Log Message:
-----------
Remove SSL libs that are no longer required on Win32.
Modified Files:
--------------
pgadmin3/src:
pgAdmin3.dsp (r1.114 -> r1.115)
Index: pgAdmin3.dsp
===================================================================
RCS file: /projects/pgadmin3/src/pgAdmin3.dsp,v
retrieving revision 1.114
retrieving revision 1.115
diff -Lsrc/pgAdmin3.dsp -Lsrc/pgAdmin3.dsp -u -w -r1.114 -r1.115
--- src/pgAdmin3.dsp
+++ src/pgAdmin3.dsp
@@ -56,7 +56,7 @@
# 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 libpq.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"
+# 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/lib/vc_lib" /libpath:"c:/postgresql/lib"
!ELSEIF "$(CFG)" == "pgAdmin3 - Win32 Unicode SSL Release"
@@ -84,7 +84,7 @@
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 libpq.lib ssleay32.lib libeay32.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/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/lib/vc_lib" /libpath:"c:/postgresql/lib"
# SUBTRACT LINK32 /pdb:none
!ENDIF
---------------------------(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
