Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. gsockmsw.c compiles in Unicode mode

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2000-08-12 20:37:18 +00:00
parent 95fecb054a
commit 45d27b94de
8 changed files with 447 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
distrib/msw/tmake/vc6.t
View File

@@ -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

16
distrib/msw/tmake/vc6dll.t
View File

@@ -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

8
distrib/msw/tmake/vcapp.t
View File

@@ -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;
}