1. gsockmsw.c compiles in Unicode mode

2. wxBase project files updated/added 3. more fixes to tmake scripts: now work for any combination of lib/dll unicode/ansi settings git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@8060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-08-12 20:37:18 +00:00
parent 95fecb054a
commit 45d27b94de
8 changed files with 447 additions and 31 deletions
--- a/distrib/msw/tmake/vc6.t
+++ b/distrib/msw/tmake/vc6.t
@@ -117,7 +117,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir #$ Substitute('"Debug$$OUTDIR_SUFFIX"');
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" -D "_MT" /YX /FD /c
-# ADD CPP /nologo /MDd /W4 /Zi /Od /I "$(wx)\include" /I "$(wx)\src\zlib" /I "$(wx)\src\jpeg" /I "$(wx)\src\png" /I "$(wx)\src\tiff" /D "_DEBUG" /D DEBUG=1 /D WXDEBUG=1 /D "__WXDEBUG__" /Fr /D "_MT" #$ Substitute('$$WX_CFLAGS /Yu"wx/wxprec.h" /FD /c');
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "$(wx)\include" /I "$(wx)\src\zlib" /I "$(wx)\src\jpeg" /I "$(wx)\src\png" /I "$(wx)\src\tiff" /D "_DEBUG" /D DEBUG=1 /D WXDEBUG=1 /D "__WXDEBUG__" /D "_MT" #$ Substitute('$$WX_CFLAGS /Yu"wx/wxprec.h" /FD /c');
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
@@ -152,17 +152,8 @@ SOURCE=.\src\msw\dummy.cpp

 SOURCE=.\src\common\y_tab.c

-!IF  "$(CFG)" == #$ Substitute('"$$PROJECTNAME - Win32 Release"');
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == #$ Substitute('"$$PROJECTNAME - Win32 Debug"');
-
 # ADD CPP /W1
 # SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
 # End Source File
 # End Target
 # End Project
--- a/distrib/msw/tmake/vc6dll.t
+++ b/distrib/msw/tmake/vc6dll.t
@@ -121,12 +121,12 @@ LINK32=link.exe
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 # PROP BASE Output_Dir #$ Substitute('"Debug$$OUTDIR_SUFFIX"');
-# PROP BASE Intermediate_Dir  #$ Substitute('"Debug$$OUTDIR_SUFFIX"');
+# PROP BASE Intermediate_Dir #$ Substitute('"Debug$$OUTDIR_SUFFIX"');
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir #$ Substitute('"Debug$$OUTDIR_SUFFIX"');
-# PROP Intermediate_Dir  #$ Substitute('"Debug$$OUTDIR_SUFFIX"');
+# PROP Intermediate_Dir #$ Substitute('"Debug$$OUTDIR_SUFFIX"');
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c
@@ -166,23 +166,15 @@ SOURCE=.\src\msw\dummydll.cpp
 # Begin Source File

 SOURCE=.\src\msw\version.rc
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /d "_UNICODE"
 # End Source File
 # Begin Source File

 SOURCE=.\src\common\y_tab.c

-!IF  "$(CFG)" == #$ Substitute('"$$PROJECTNAME - Win32 Release"');
-
 # ADD CPP /W1
 # SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == #$ Substitute('"$$PROJECTNAME - Win32 Debug"');
-
-# ADD CPP /W1
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
 # End Source File
 # End Target
 # End Project
--- a/distrib/msw/tmake/vcapp.t
+++ b/distrib/msw/tmake/vcapp.t
@@ -54,10 +54,10 @@

    if ( Config("unicode") ) {
 	if ( Config("dll") ) { $DLL_SUFFIX = "ud"; }
-	$UNICODE_FLAGS="/D _UNICODE /D UNICODE";
+	$UNICODE_FLAGS="/D _UNICODE /D UNICODE ";
    }
    else {
-	$UNICODE_FLAGS="";
+	$UNICODE_FLAGS=" ";
    }

    #! let's be smarter: first of all, if no extension is given, add .lib
@@ -93,7 +93,7 @@
 	    $vc_link_debug .= " /libpath:$_\\Debug";
 	}

-	$vc_cpp_def_common = '/D "WIN32" /D "_WINDOWS" ' . $DLL_FLAGS;
+	$vc_cpp_def_common = '/D "WIN32" /D "_WINDOWS" ' . $UNICODE_FLAGS . $DLL_FLAGS;
 	$vc_cpp_def_release = '/D "NDEBUG" ' . $vc_cpp_def_common;
 	$vc_cpp_def_debug   = '/D "_DEBUG" ' . $vc_cpp_def_common;
    } else {
@@ -108,7 +108,7 @@
 	$vc_link_release .= '/nologo /subsystem:console /machine:I386';
 	$vc_link_debug   .= '/nologo /subsystem:console /debug /machine:I386 /pdbtype:sept';

-	$vc_cpp_def_common = '/D "WIN32" /D "_CONSOLE" ' . $DLL_FLAGS;
+	$vc_cpp_def_common = '/D "WIN32" /D "_CONSOLE" ' . $UNICODE_FLAGS . $DLL_FLAGS;
 	$vc_cpp_def_release = '/D "NDEBUG" ' . $vc_cpp_def_common; 
 	$vc_cpp_def_debug   = '/D "_DEBUG" ' . $vc_cpp_def_common;
    }
--- a/src/msw/gsockmsw.c
+++ b/src/msw/gsockmsw.c
@@ -58,8 +58,14 @@
 #  pragma warning(default:4115) /* named type definition in parentheses */
 #endif

+/* VZ: I don't know if _T() macro is always defined here? */
+#ifdef _UNICODE
+#define CLASSNAME  L"_GSocket_Internal_Window_Class"
+#define WINDOWNAME L"_GSocket_Internal_Window_Name"
+#else /* !Unicode */
 #define CLASSNAME  "_GSocket_Internal_Window_Class"
 #define WINDOWNAME "_GSocket_Internal_Window_Name"
+#endif /* Unicode/!Unicode */

 /* Maximum number of different GSocket objects at a given time.
 * This value can be modified at will, but it CANNOT be greater
--- a/src/msw/version.rc
+++ b/src/msw/version.rc
@@ -13,10 +13,18 @@

 #ifdef _DEBUG
    #define DLL_FLAGS 0x1L
-    #define DLL_SUFFIX "d"
+    #ifdef _UNICODE
+        #define DLL_SUFFIX "ud"
+    #else
+        #define DLL_SUFFIX "d"
+    #endif
 #else
    #define DLL_FLAGS 0x0L
-    #define DLL_SUFFIX ""
+    #ifdef _UNICODE
+        #define DLL_SUFFIX "u"
+    #else
+        #define DLL_SUFFIX ""
+    #endif
 #endif

 1 VERSIONINFO
@@ -43,7 +51,9 @@ BEGIN
            VALUE "PrivateBuild", "\0"
            VALUE "ProductName", "wxWindows\0"
            VALUE "ProductVersion", "2.2.1\0"
-            VALUE "SpecialBuild", "\0"
+#ifdef _UNICODE
+            VALUE "SpecialBuild", "Unicode build\0"
+#endif
        END
    END
 END
--- a/wxBase.dsp
+++ b/wxBase.dsp
@@ -40,8 +40,8 @@ RSC=rc.exe
 # PROP Output_Dir "BaseRelease"
 # PROP Intermediate_Dir "BaseRelease"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /Zi /O2 /I "$(wx)\include" /I "$(wx)\src\zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D WIN95=1 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN32__" /D "_MT" /Yu"wx/wxprec.h" /FD /c
+# ADD BASE CPP /nologo /MD /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /Zi /O1 /I "$(wx)\include" /I "$(wx)\src\zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D WIN95=1 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN32__" /D "_MT" /Yu"wx/wxprec.h" /FD /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
--- a/wxBase.dsw
+++ b/wxBase.dsw
@@ -0,0 +1,41 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "wxBase"=.\wxBase.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "wxBaseDll"=.\wxBaseDll.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
--- a/wxBaseDll.dsp
+++ b/wxBaseDll.dsp
@@ -0,0 +1,376 @@
+# Microsoft Developer Studio Project File - Name="wxBaseDll" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=wxBaseDll - 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 NMAKE /f "wxBaseDll.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "wxBaseDll.mak" CFG="wxBaseDll - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "wxBaseDll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "wxBaseDll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "wxBaseDll - 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 "BaseDllRelease"
+# PROP Intermediate_Dir "BaseDllRelease"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXBASEDLL_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MT /W4 /O1 /I "$(wx)\include" /I "$(wx)\src\zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WIN32__" /D "__WXMSW__" /D "_MT" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /i "$(wx)\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 /nologo /dll /machine:I386 /out:"BaseDllRelease/wxbase221.dll"
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib wsock32.lib /nologo /version:2.2 /dll /machine:I386 /out:"BaseDllRelease/wxbase221.dll"
+
+!ELSEIF  "$(CFG)" == "wxBaseDll - 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 "BaseDllDebug"
+# PROP Intermediate_Dir "BaseDllDebug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXBASEDLL_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W4 /Gm /Zi /Od /I "$(wx)\include" /I "$(wx)\src\zlib" /D "_DEBUG" /D wxUSE_GUI=0 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WIN32__" /D "__WXMSW__" /D "_MT" /D "WXMAKINGDLL" /D "__WXDEBUG__" /Yu"wx/wxprec.h" /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /i "$(wx)\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 /nologo /dll /debug /machine:I386 /pdbtype:sept /out:"BaseDllDebug/wxbase221d.dll"
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib wsock32.lib /nologo /version:2.2 /dll /debug /machine:I386 /pdbtype:sept /out:"BaseDllDebug/wxbase221d.dll"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "wxBaseDll - Win32 Release"
+# Name "wxBaseDll - Win32 Debug"
+# Begin Source File
+
+SOURCE=.\src\common\base.rc
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\msw\dummydll.cpp
+# ADD CPP /Yc"wx/wxprec.h"
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\appcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\cmdline.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\config.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\datetime.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\datstrm.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\dynarray.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\dynlib.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\encconv.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\event.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\ffile.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\file.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\fileconf.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\filefn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\filesys.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\fontmap.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\fs_inet.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\fs_mem.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\fs_zip.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\ftp.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\hash.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\http.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\intl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\ipcbase.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\list.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\log.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\longlong.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\mimecmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\module.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\mstream.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\object.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\objstrm.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\process.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\protocol.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\sckaddr.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\sckfile.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\sckipc.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\sckstrm.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\serbase.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\socket.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\strconv.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\stream.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\string.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\textfile.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\timercmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\tokenzr.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\txtstrm.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\url.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\utilscmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\variant.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\wfstream.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\wxchar.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\zipstrm.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\zstream.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\init.cpp
+# End Source File
+
+# Begin Source File
+
+SOURCE=.\src\msw\dde.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\msw\dir.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\msw\main.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\msw\mimetype.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\msw\regconf.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\msw\registry.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\msw\thread.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\msw\utils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\msw\utilsexc.cpp
+# End Source File
+
+# Begin Source File
+
+SOURCE=.\src\common\extended.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\unzip.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+
+# Begin Source File
+
+SOURCE=.\src\msw\gsocket.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\msw\gsockmsw.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+
+# End Target
+# End Project