mingw compilation fixes

[wxWidgets.git] / src / wxvc_dll.dsp

diff --git a/src/wxvc_dll.dsp b/src/wxvc_dll.dsp
index 6832678bc13f292e08a702ba730e25044a6e308c..99b716ffa8c4f48a77206e3584bc847abbebfa5f 100644 (file)
--- a/src/wxvc_dll.dsp
+++ b/src/wxvc_dll.dsp
@@ -7,19 +7,19 @@
 CFG=wxvc_dll - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
-!MESSAGE
+!MESSAGE 
 !MESSAGE NMAKE /f "wxvc_dll.mak".
-!MESSAGE
+!MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE 
 !MESSAGE NMAKE /f "wxvc_dll.mak" CFG="wxvc_dll - Win32 Debug"
-!MESSAGE
+!MESSAGE 
 !MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE 
 !MESSAGE "wxvc_dll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "wxvc_dll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
+!MESSAGE 
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # 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 /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib rpcrt4.lib winmm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"../lib/wx23_1.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib rpcrt4.lib winmm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"../lib/wx23_2.dll"
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -79,9 +79,9 @@ BSC32=bscmake.exe
 # 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 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib rpcrt4.lib winmm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"../lib/wx23_1d.dll" /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib rpcrt4.lib winmm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"../lib/wx23_2d.dll" /pdbtype:sept
 
-!ENDIF
+!ENDIF 
 
 # Begin Target
 
@@ -104,11 +104,11 @@ SOURCE=.\common\clipcmn.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\cmdproc.cpp
+SOURCE=.\common\cmdline.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\cmdline.cpp
+SOURCE=.\common\cmdproc.cpp
 # End Source File
 # Begin Source File
 
@@ -260,6 +260,10 @@ SOURCE=.\common\ftp.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\gaugecmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\gdicmn.cpp
 # End Source File
 # Begin Source File
@@ -379,6 +383,10 @@ SOURCE=.\common\mstream.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\nbkbase.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\object.cpp
 # End Source File
 # Begin Source File
@@ -463,6 +471,10 @@ SOURCE=.\common\string.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\sysopt.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\tbarbase.cpp
 # End Source File
 # Begin Source File
@@ -630,7 +642,7 @@ SOURCE=.\generic\sashwin.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\generic\scrolwin.cpp
+SOURCE=.\generic\scrlwing.cpp
 # End Source File
 # Begin Source File
 
@@ -1395,7 +1407,7 @@ SOURCE=.\jpeg\jcapimin.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1412,7 +1424,7 @@ SOURCE=.\jpeg\jcapistd.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1429,7 +1441,7 @@ SOURCE=.\jpeg\jccoefct.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1446,7 +1458,7 @@ SOURCE=.\jpeg\jccolor.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1463,7 +1475,7 @@ SOURCE=.\jpeg\jcdctmgr.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1480,7 +1492,7 @@ SOURCE=.\jpeg\jchuff.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1497,7 +1509,7 @@ SOURCE=.\jpeg\jcinit.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1514,7 +1526,7 @@ SOURCE=.\jpeg\jcmainct.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1531,7 +1543,7 @@ SOURCE=.\jpeg\jcmarker.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1548,7 +1560,7 @@ SOURCE=.\jpeg\jcmaster.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1565,7 +1577,7 @@ SOURCE=.\jpeg\jcomapi.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1582,7 +1594,7 @@ SOURCE=.\jpeg\jcparam.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1599,7 +1611,7 @@ SOURCE=.\jpeg\jcphuff.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1616,7 +1628,7 @@ SOURCE=.\jpeg\jcprepct.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1633,7 +1645,7 @@ SOURCE=.\jpeg\jcsample.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1650,7 +1662,7 @@ SOURCE=.\jpeg\jctrans.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1667,7 +1679,7 @@ SOURCE=.\jpeg\jdapimin.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1684,7 +1696,7 @@ SOURCE=.\jpeg\jdapistd.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1701,7 +1713,7 @@ SOURCE=.\jpeg\jdatadst.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1718,7 +1730,7 @@ SOURCE=.\jpeg\jdatasrc.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1735,7 +1747,7 @@ SOURCE=.\jpeg\jdcoefct.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1752,7 +1764,7 @@ SOURCE=.\jpeg\jdcolor.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1769,7 +1781,7 @@ SOURCE=.\jpeg\jddctmgr.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1786,7 +1798,7 @@ SOURCE=.\jpeg\jdhuff.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1803,7 +1815,7 @@ SOURCE=.\jpeg\jdinput.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1820,7 +1832,7 @@ SOURCE=.\jpeg\jdmainct.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1837,7 +1849,7 @@ SOURCE=.\jpeg\jdmarker.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1854,7 +1866,7 @@ SOURCE=.\jpeg\jdmaster.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1871,7 +1883,7 @@ SOURCE=.\jpeg\jdmerge.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1888,7 +1900,7 @@ SOURCE=.\jpeg\jdphuff.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1905,7 +1917,7 @@ SOURCE=.\jpeg\jdpostct.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1922,7 +1934,7 @@ SOURCE=.\jpeg\jdsample.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1939,7 +1951,7 @@ SOURCE=.\jpeg\jdtrans.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1956,7 +1968,7 @@ SOURCE=.\jpeg\jerror.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1973,7 +1985,7 @@ SOURCE=.\jpeg\jfdctflt.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -1990,7 +2002,7 @@ SOURCE=.\jpeg\jfdctfst.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -2007,7 +2019,7 @@ SOURCE=.\jpeg\jfdctint.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -2024,7 +2036,7 @@ SOURCE=.\jpeg\jidctflt.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -2041,7 +2053,7 @@ SOURCE=.\jpeg\jidctfst.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -2058,7 +2070,7 @@ SOURCE=.\jpeg\jidctint.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -2075,7 +2087,7 @@ SOURCE=.\jpeg\jidctred.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -2092,7 +2104,7 @@ SOURCE=.\jpeg\jmemmgr.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -2109,7 +2121,7 @@ SOURCE=.\jpeg\jmemnobs.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -2126,7 +2138,7 @@ SOURCE=.\jpeg\jquant1.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -2143,7 +2155,7 @@ SOURCE=.\jpeg\jquant2.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -2160,7 +2172,7 @@ SOURCE=.\jpeg\jutils.c
 # ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # End Group