SVN Commit by dpage: r4209 - in trunk/pgadmin3: . i18n pkg pkg/debian pkg/fc1 pkg/mac pkg/mandrake pkg/redhat pkg/slackware pkg/src pkg/win32 src xtra xtra/pgagent

Author: dpage
Date: 2005-05-18 12:23:14 +0100 (Wed, 18 May 2005)
New Revision: 4209

Modified:
trunk/pgadmin3/Makefile.am
trunk/pgadmin3/acinclude.m4
trunk/pgadmin3/i18n/Makefile.am
trunk/pgadmin3/pkg/Makefile.am
trunk/pgadmin3/pkg/debian/Makefile.am
trunk/pgadmin3/pkg/fc1/Makefile.am
trunk/pgadmin3/pkg/mac/Makefile.am
trunk/pgadmin3/pkg/mandrake/Makefile.am
trunk/pgadmin3/pkg/redhat/Makefile.am
trunk/pgadmin3/pkg/slackware/Makefile.am
trunk/pgadmin3/pkg/slackware/build-release
trunk/pgadmin3/pkg/slackware/build-snapshot
trunk/pgadmin3/pkg/src/Makefile.am
trunk/pgadmin3/pkg/src/build-tarball
trunk/pgadmin3/pkg/win32/Makefile.am
trunk/pgadmin3/pkg/win32/banner.bmp
trunk/pgadmin3/pkg/win32/licence.rtf
trunk/pgadmin3/pkg/win32/pgadmin3.wsi
trunk/pgadmin3/pkg/win32/pgadmin3.wsm
trunk/pgadmin3/pkg/win32/screen.bmp
trunk/pgadmin3/src/Makefile.am
trunk/pgadmin3/src/pgAdmin3.dsp
trunk/pgadmin3/xtra/Makefile.am
trunk/pgadmin3/xtra/pgagent/Makefile.am
trunk/pgadmin3/xtra/pgagent/pgAgent.dsp
Log:
Fix ID tags

Modified: trunk/pgadmin3/Makefile.am
===================================================================
--- trunk/pgadmin3/Makefile.am 2005-05-18 11:14:19 UTC (rev 4208)
+++ trunk/pgadmin3/Makefile.am 2005-05-18 11:23:14 UTC (rev 4209)
@@ -1,4 +1,5 @@
# pgAdmin III - PostgreSQL Tools
+# $Id$
# Copyright (C) 2002 - 2005, The pgAdmin Development Team
# This software is released under the Artistic Licence
#

Property changes on: trunk/pgadmin3/Makefile.am
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
+ Id LastChangedDate Author

Modified: trunk/pgadmin3/acinclude.m4
===================================================================
--- trunk/pgadmin3/acinclude.m4 2005-05-18 11:14:19 UTC (rev 4208)
+++ trunk/pgadmin3/acinclude.m4 2005-05-18 11:23:14 UTC (rev 4209)
@@ -1,6 +1,7 @@
#######################################################################
#
# pgAdmin III - PostgreSQL Tools
+# $Id$
# Copyright (C) 2002 - 2005, The pgAdmin Development Team
# This software is released under the Artistic Licence
#

Property changes on: trunk/pgadmin3/acinclude.m4
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
+ Id LastChangedDate Author

Modified: trunk/pgadmin3/i18n/Makefile.am
===================================================================
--- trunk/pgadmin3/i18n/Makefile.am 2005-05-18 11:14:19 UTC (rev 4208)
+++ trunk/pgadmin3/i18n/Makefile.am 2005-05-18 11:23:14 UTC (rev 4209)
@@ -1,6 +1,7 @@
#######################################################################
#
-# pgAdmin III - PostgreSQL Tools
+# pgAdmin III - PostgreSQL Tools
+# $Id$
# Copyright (C) 2002 - 2005, The pgAdmin Development Team
# This software is released under the Artistic Licence
#

Property changes on: trunk/pgadmin3/i18n/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Id LastChangedDate Author

Modified: trunk/pgadmin3/pkg/Makefile.am
===================================================================
--- trunk/pgadmin3/pkg/Makefile.am 2005-05-18 11:14:19 UTC (rev 4208)
+++ trunk/pgadmin3/pkg/Makefile.am 2005-05-18 11:23:14 UTC (rev 4209)
@@ -1,8 +1,11 @@
+##############################################################################
# pgAdmin III - PostgreSQL Tools
+# $Id$
# Copyright (C) 2002 - 2005, The pgAdmin Development Team
# This software is released under the Artistic Licence
#
# Makefile - Makefile for *nix systems
+##############################################################################

SUBDIRS = debian fc1 mac mandrake redhat slackware src win32

Property changes on: trunk/pgadmin3/pkg/Makefile.am
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
+ Id LastChangedDate Author

Modified: trunk/pgadmin3/pkg/debian/Makefile.am
===================================================================
--- trunk/pgadmin3/pkg/debian/Makefile.am 2005-05-18 11:14:19 UTC (rev 4208)
+++ trunk/pgadmin3/pkg/debian/Makefile.am 2005-05-18 11:23:14 UTC (rev 4209)
@@ -1,8 +1,12 @@
+##############################################################################
# pgAdmin III - PostgreSQL Tools
+# $Id$
# Copyright (C) 2002 - 2005, The pgAdmin Development Team
# This software is released under the Artistic Licence
#
# Makefile - Makefile for *nix systems
+##############################################################################
+
EXTRA_DIST = \
$(srcdir)/changelog \
$(srcdir)/compat \

Property changes on: trunk/pgadmin3/pkg/debian/Makefile.am
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
+ Id LastChangedDate Author

Modified: trunk/pgadmin3/pkg/fc1/Makefile.am
===================================================================
--- trunk/pgadmin3/pkg/fc1/Makefile.am 2005-05-18 11:14:19 UTC (rev 4208)
+++ trunk/pgadmin3/pkg/fc1/Makefile.am 2005-05-18 11:23:14 UTC (rev 4209)
@@ -1,8 +1,11 @@
+##############################################################################
# pgAdmin III - PostgreSQL Tools
+# $Id$
# Copyright (C) 2002 - 2005, The pgAdmin Development Team
# This software is released under the Artistic Licence
#
# Makefile - Makefile for *nix systems
+##############################################################################

EXTRA_DIST = \
$(srcdir)/pgadmin3.spec

Property changes on: trunk/pgadmin3/pkg/fc1/Makefile.am
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
+ Id LastChangedDate Author

Modified: trunk/pgadmin3/pkg/mac/Makefile.am
===================================================================
--- trunk/pgadmin3/pkg/mac/Makefile.am 2005-05-18 11:14:19 UTC (rev 4208)
+++ trunk/pgadmin3/pkg/mac/Makefile.am 2005-05-18 11:23:14 UTC (rev 4209)
@@ -1,8 +1,11 @@
+##############################################################################
# pgAdmin III - PostgreSQL Tools
+# $Id$
# Copyright (C) 2002 - 2005, The pgAdmin Development Team
# This software is released under the Artistic Licence
#
# Makefile - Makefile for *nix systems
+##############################################################################

EXTRA_DIST = \
$(srcdir)/Info.plist \

Property changes on: trunk/pgadmin3/pkg/mac/Makefile.am
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
+ Id LastChangedDate Author

Modified: trunk/pgadmin3/pkg/mandrake/Makefile.am
===================================================================
--- trunk/pgadmin3/pkg/mandrake/Makefile.am 2005-05-18 11:14:19 UTC (rev 4208)
+++ trunk/pgadmin3/pkg/mandrake/Makefile.am 2005-05-18 11:23:14 UTC (rev 4209)
@@ -1,8 +1,11 @@
+##############################################################################
# pgAdmin III - PostgreSQL Tools
+# $Id$
# Copyright (C) 2002 - 2005, The pgAdmin Development Team
# This software is released under the Artistic Licence
#
# Makefile - Makefile for *nix systems
+##############################################################################

EXTRA_DIST = \
$(srcdir)/pgadmin3.spec

Property changes on: trunk/pgadmin3/pkg/mandrake/Makefile.am
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
+ Id LastChangedDate Author

Modified: trunk/pgadmin3/pkg/redhat/Makefile.am
===================================================================
--- trunk/pgadmin3/pkg/redhat/Makefile.am 2005-05-18 11:14:19 UTC (rev 4208)
+++ trunk/pgadmin3/pkg/redhat/Makefile.am 2005-05-18 11:23:14 UTC (rev 4209)
@@ -1,8 +1,11 @@
+##############################################################################
# pgAdmin III - PostgreSQL Tools
+# $Id$
# Copyright (C) 2002 - 2005, The pgAdmin Development Team
# This software is released under the Artistic Licence
#
# Makefile - Makefile for *nix systems
+##############################################################################

EXTRA_DIST = \
$(srcdir)/pgadmin3.spec

Property changes on: trunk/pgadmin3/pkg/redhat/Makefile.am
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
+ Id LastChangedDate Author

Modified: trunk/pgadmin3/pkg/slackware/Makefile.am
===================================================================
--- trunk/pgadmin3/pkg/slackware/Makefile.am 2005-05-18 11:14:19 UTC (rev 4208)
+++ trunk/pgadmin3/pkg/slackware/Makefile.am 2005-05-18 11:23:14 UTC (rev 4209)
@@ -1,8 +1,11 @@
+##############################################################################
# pgAdmin III - PostgreSQL Tools
+# $Id$
# Copyright (C) 2002 - 2005, The pgAdmin Development Team
# This software is released under the Artistic Licence
#
# Makefile - Makefile for *nix systems
+##############################################################################

EXTRA_DIST = \
$(srcdir)/build-release \

Property changes on: trunk/pgadmin3/pkg/slackware/Makefile.am
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
+ Id LastChangedDate Author

Modified: trunk/pgadmin3/pkg/slackware/build-release
===================================================================
--- trunk/pgadmin3/pkg/slackware/build-release 2005-05-18 11:14:19 UTC (rev 4208)
+++ trunk/pgadmin3/pkg/slackware/build-release 2005-05-18 11:23:14 UTC (rev 4209)
@@ -3,6 +3,7 @@
#######################################################################
#
# pgAdmin III - PostgreSQL Tools
+# $Id$
# Copyright (C) 2002 - 2005, The pgAdmin Development Team
# This software is released under the Artistic Licence
#

Property changes on: trunk/pgadmin3/pkg/slackware/build-release
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
+ Id LastChangedDate Author

Modified: trunk/pgadmin3/pkg/slackware/build-snapshot
===================================================================
--- trunk/pgadmin3/pkg/slackware/build-snapshot 2005-05-18 11:14:19 UTC (rev 4208)
+++ trunk/pgadmin3/pkg/slackware/build-snapshot 2005-05-18 11:23:14 UTC (rev 4209)
@@ -3,6 +3,7 @@
#######################################################################
#
# pgAdmin III - PostgreSQL Tools
+# $Id$
# Copyright (C) 2002 - 2005, The pgAdmin Development Team
# This software is released under the Artistic Licence
#

Property changes on: trunk/pgadmin3/pkg/slackware/build-snapshot
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
+ Id LastChangedDate Author

Modified: trunk/pgadmin3/pkg/src/Makefile.am
===================================================================
--- trunk/pgadmin3/pkg/src/Makefile.am 2005-05-18 11:14:19 UTC (rev 4208)
+++ trunk/pgadmin3/pkg/src/Makefile.am 2005-05-18 11:23:14 UTC (rev 4209)
@@ -1,8 +1,11 @@
+##############################################################################
# pgAdmin III - PostgreSQL Tools
+# $Id$
# Copyright (C) 2002 - 2005, The pgAdmin Development Team
# This software is released under the Artistic Licence
#
# Makefile - Makefile for *nix systems
+##############################################################################

EXTRA_DIST = \
$(srcdir)/build-tarball

Property changes on: trunk/pgadmin3/pkg/src/Makefile.am
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
+ Id LastChangedDate Author

Modified: trunk/pgadmin3/pkg/src/build-tarball
===================================================================
--- trunk/pgadmin3/pkg/src/build-tarball 2005-05-18 11:14:19 UTC (rev 4208)
+++ trunk/pgadmin3/pkg/src/build-tarball 2005-05-18 11:23:14 UTC (rev 4209)
@@ -3,6 +3,7 @@
#######################################################################
#
# pgAdmin III - PostgreSQL Tools
+# $Id$
# Copyright (C) 2002 - 2005, The pgAdmin Development Team
# This software is released under the Artistic Licence
#

Property changes on: trunk/pgadmin3/pkg/src/build-tarball
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
+ Id LastChangedDate Author

Modified: trunk/pgadmin3/pkg/win32/Makefile.am
===================================================================
--- trunk/pgadmin3/pkg/win32/Makefile.am 2005-05-18 11:14:19 UTC (rev 4208)
+++ trunk/pgadmin3/pkg/win32/Makefile.am 2005-05-18 11:23:14 UTC (rev 4209)
@@ -1,8 +1,11 @@
+##############################################################################
# pgAdmin III - PostgreSQL Tools
+# $Id$
# Copyright (C) 2002 - 2005, The pgAdmin Development Team
# This software is released under the Artistic Licence
#
# Makefile - Makefile for *nix systems
+##############################################################################

EXTRA_DIST = \
$(srcdir)/banner.bmp \

Property changes on: trunk/pgadmin3/pkg/win32/Makefile.am
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
+ Id LastChangedDate Author

Property changes on: trunk/pgadmin3/pkg/win32/banner.bmp
___________________________________________________________________
Name: svn:keywords
+ Id LastChangedDate Author

Property changes on: trunk/pgadmin3/pkg/win32/licence.rtf
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
+ Id LastChangedDate Author

Property changes on: trunk/pgadmin3/pkg/win32/pgadmin3.wsi
___________________________________________________________________
Name: svn:keywords
+ Id LastChangedDate Author

Property changes on: trunk/pgadmin3/pkg/win32/pgadmin3.wsm
___________________________________________________________________
Name: svn:keywords
+ Id LastChangedDate Author

Property changes on: trunk/pgadmin3/pkg/win32/screen.bmp
___________________________________________________________________
Name: svn:keywords
+ Id LastChangedDate Author

Modified: trunk/pgadmin3/src/Makefile.am
===================================================================
--- trunk/pgadmin3/src/Makefile.am 2005-05-18 11:14:19 UTC (rev 4208)
+++ trunk/pgadmin3/src/Makefile.am 2005-05-18 11:23:14 UTC (rev 4209)
@@ -1,6 +1,7 @@
#######################################################################
#
# pgAdmin III - PostgreSQL Tools
+# $Id$
# Copyright (C) 2002 - 2005, The pgAdmin Development Team
# This software is released under the Artistic Licence
#

Property changes on: trunk/pgadmin3/src/Makefile.am
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
+ Id LastChangedDate Author

Modified: trunk/pgadmin3/src/pgAdmin3.dsp
===================================================================
--- trunk/pgadmin3/src/pgAdmin3.dsp 2005-05-18 11:14:19 UTC (rev 4208)
+++ trunk/pgadmin3/src/pgAdmin3.dsp 2005-05-18 11:23:14 UTC (rev 4209)
@@ -73,7 +73,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /GX /O2 /Ob2 /I "c:/wxWidgets-2.6/include" /I "c:/wxWidgets-2.6/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 CPP /nologo /MDd /W3 /GX /O2 /Ob2 /I "c:/wxWidgets-2.6/include" /I "c:/wxWidgets-2.6/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 CPP /nologo /MDd /W3 /GX /O2 /Ob2 /I "c:/wxWidgets-2.6/include" /I "c:/wxWidgets-2.6/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"pgamsgevent.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" /d "NDEBUG"

Property changes on: trunk/pgadmin3/xtra/Makefile.am
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
+ Id LastChangedDate Author

Modified: trunk/pgadmin3/xtra/pgagent/Makefile.am
===================================================================
--- trunk/pgadmin3/xtra/pgagent/Makefile.am 2005-05-18 11:14:19 UTC (rev 4208)
+++ trunk/pgadmin3/xtra/pgagent/Makefile.am 2005-05-18 11:23:14 UTC (rev 4209)
@@ -1,5 +1,5 @@
# pgAdmin III - PostgreSQL Tools
-# $id$
+# $Id$
# Copyright (C) 2002 - 2005, The pgAdmin Development Team
# This software is released under the Artistic Licence
#

Property changes on: trunk/pgadmin3/xtra/pgagent/Makefile.am
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
+ Id LastChangedDate Author

Modified: trunk/pgadmin3/xtra/pgagent/pgAgent.dsp
===================================================================
--- trunk/pgadmin3/xtra/pgagent/pgAgent.dsp 2005-05-18 11:14:19 UTC (rev 4208)
+++ trunk/pgadmin3/xtra/pgagent/pgAgent.dsp 2005-05-18 11:23:14 UTC (rev 4209)
@@ -43,16 +43,16 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "include" /I "c:/program files/postgresql/8.0/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_MT" /FR /Yu"pgAgent.h" /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "include" /I "c:/program files/postgresql/8.0/include" /I "c:/wxWidgets-2.6/include" /I "c:/wxWidgets-2.6/contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_MT" /FR /Yu"pgAgent.h" /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x407 /d "_DEBUG"
-# ADD RSC /l 0x407 /d "_DEBUG"
+# ADD RSC /l 0x407 /i "c:/wxWidgets-2.6/include" /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib advapi32.lib user32.lib gdi32.lib wsock32.lib libpq.lib msvcrtd.lib oldnames.lib libcpmtd.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib /pdbtype:sept /libpath:"c:/program files/postgresql/8.0/lib/ms"
+# ADD LINK32 kernel32.lib advapi32.lib user32.lib gdi32.lib wsock32.lib libpq.lib msvcrtd.lib oldnames.lib libcpmtd.lib wxbase26ud.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_core.lib wxmsw26ud_html.lib wxregexud.lib wxpngd.lib wxzlibd.lib wxjpegd.lib wxtiffd.lib wxmsw26ud_stc.lib wxmsw26ud_ogl.lib wxmsw26ud_xrc.lib wxexpatd.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib /pdbtype:sept /libpath:"c:/wxWidgets-2.6/lib/vc_lib" /libpath:"c:/program files/postgresql/8.0/lib/ms"
# SUBTRACT LINK32 /pdb:none

!ELSEIF "$(CFG)" == "pgAgent - Win32 Release"
@@ -70,16 +70,16 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "include" /I "c:/program files/postgresql/8.0/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_MT" /Yu"pgAgent.h" /FD /GZ /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "include" /I "c:/program files/postgresql/8.0/include" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_MT" /FR /Yu"pgAgent.h" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "include" /I "c:/program files/postgresql/8.0/include" /I "c:/wxWidgets-2.6/include" /I "c:/wxWidgets-2.6/contrib/include" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_MT" /FR /Yu"pgamsgevent.h" /FD /c
# ADD BASE RSC /l 0x407 /d "_DEBUG"
-# ADD RSC /l 0x809
+# ADD RSC /l 0x809 /i "c:/wxWidgets-2.6/include"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib advapi32.lib user32.lib gdi32.lib wsock32.lib libpq.lib msvcrtd.lib oldnames.lib libcpmtd.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib /pdbtype:sept /libpath:"c:/program files/postgresql/8.0/lib/ms"
# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 wsock32.lib libpq.lib msvcrt.lib oldnames.lib libcpmt.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:I386 /nodefaultlib /pdbtype:sept /libpath:"c:/program files/postgresql/8.0/lib/ms"
+# ADD LINK32 wsock32.lib libpq.lib wxbase26u.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_core.lib wxmsw26u_html.lib wxregexu.lib wxpng.lib wxzlib.lib wxjpeg.lib wxtiff.lib wxmsw26u_stc.lib wxmsw26u_ogl.lib wxmsw26u_xrc.lib wxexpat.lib msvcrt.lib oldnames.lib libcpmt.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:I386 /nodefaultlib /pdbtype:sept /libpath:"c:/wxWidgets-2.6/lib/vc_lib" /libpath:"c:/program files/postgresql/8.0/lib/ms"
# SUBTRACT LINK32 /pdb:none /debug

!ENDIF