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

final correctiosn to wxBase project generation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@8064 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-08-12 21:02:45 +00:00
parent d63f569944
commit 9d84a7e5ef
2 changed files with 47 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.cvsignore
View File

@@ -24,20 +24,20 @@ linux-gnu.system.cache
*.swq *.swq
Release Release
Debug Debug
ReleaseDLL ReleaseDll
DebugDLL DebugDll
ReleaseUnicode ReleaseUnicode
DebugUnicode DebugUnicode
ReleaseUnicodeDLL ReleaseUnicodeDll
DebugUnicodeDLL DebugUnicodeDll
BaseRelease BaseRelease
BaseDebug BaseDebug
BaseReleaseDLL BaseReleaseDll
BaseDebugDLL BaseDebugDll
BaseReleaseUnicode BaseReleaseUnicode
BaseDebugUnicode BaseDebugUnicode
BaseReleaseUnicodeDLL BaseReleaseUnicodeDll
BaseDebugUnicodeDLL BaseDebugUnicodeDll
robert robert
stamp-h.in stamp-h.in
Makefile Makefile

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

@@ -36,30 +36,39 @@
AddIncludePath($TMAKE_INCDIR_WX); AddIncludePath($TMAKE_INCDIR_WX);
} }
if ( Config("unicode") ) {
$UNICODE="Unicode";
$UNICODE_SUFFIX="u";
$UNICODE_FLAGS="/D _UNICODE /D UNICODE ";
$project{"TARGET"} .= "Unicode";
$project{"MAKEFILE"} .= "Unicode";
}
else {
$UNICODE="";
$UNICODE_SUFFIX="";
$UNICODE_FLAGS=" ";
}
if ( Config("dll") ) { if ( Config("dll") ) {
$DLL="Dll"; $DLL="Dll";
$DLL_SUFFIX="d"; $DEBUG_SUFFIX="d";
$DLL_OR_LIB=(Config("wxbase") ? "wxbase" : "wxmsw") . "221"; $DLL_OR_LIB=(Config("wxbase") ? "wxbase" : "wxmsw") . "221";
$DLL_FLAGS="/D WXUSINGDLL "; $DLL_FLAGS="/D WXUSINGDLL ";
$EXTRA_LIBS=""; $EXTRA_LIBS="";
$project{"TARGET"} .= "Dll";
$project{"MAKEFILE"} .= "Dll";
} }
else { else {
$DLL=""; $DLL="";
$DLL_SUFFIX=""; $DEBUG_SUFFIX="";
$DLL_OR_LIB="wxWindows"; $DLL_OR_LIB=Config("wxbase") ? "wxBase" : "wxWindows";
$DLL_FLAGS=" "; $DLL_FLAGS=" ";
#! actually this depends on the contents of setup.h #! actually this depends on the contents of setup.h
$EXTRA_LIBS=Config("wxbase") ? "" : "xpm zlib png jpeg tiff"; $EXTRA_LIBS=Config("wxbase") ? "" : "xpm zlib png jpeg tiff";
} }
if ( Config("unicode") ) {
if ( Config("dll") ) { $DLL_SUFFIX = "ud"; }
$UNICODE_FLAGS="/D _UNICODE /D UNICODE ";
}
else {
$UNICODE_FLAGS=" ";
}
#! let's be smarter: first of all, if no extension is given, add .lib #! let's be smarter: first of all, if no extension is given, add .lib
#! (this allows for LIBS=libname in project files which map either on #! (this allows for LIBS=libname in project files which map either on
#! -l libname.lib under Windows or on -llibname under Unix). #! -l libname.lib under Windows or on -llibname under Unix).
@@ -78,8 +87,8 @@
if ( Config("wx") ) { if ( Config("wx") ) {
$vc_base_libs .= "comctl32.lib rpcrt4.lib wsock32.lib "; $vc_base_libs .= "comctl32.lib rpcrt4.lib wsock32.lib ";
$vc_link_release = "$WXDIR\\Release$DLL\\$DLL_OR_LIB.lib "; $vc_link_release = "$WXDIR\\Release$UNICODE$DLL\\$DLL_OR_LIB$UNICODE_SUFFIX.lib ";
$vc_link_debug = "$WXDIR\\Debug$DLL\\$DLL_OR_LIB$DLL_SUFFIX.lib "; $vc_link_debug = "$WXDIR\\Debug$UNICODE$DLL\\$DLL_OR_LIB$UNICODE_SUFFIX$DEBUG_SUFFIX.lib ";
foreach ( split(/ /, $EXTRA_LIBS) ) { foreach ( split(/ /, $EXTRA_LIBS) ) {
$vc_link_release .= "$WXDIR\\src\\$_\\Release\\$_.lib "; $vc_link_release .= "$WXDIR\\src\\$_\\Release\\$_.lib ";
$vc_link_debug .= "$WXDIR\\src\\$_\\Debug\\$_.lib "; $vc_link_debug .= "$WXDIR\\src\\$_\\Debug\\$_.lib ";
@@ -88,11 +97,6 @@
$vc_link_release .= '/nologo /subsystem:windows /machine:I386'; $vc_link_release .= '/nologo /subsystem:windows /machine:I386';
$vc_link_debug .= '/nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept'; $vc_link_debug .= '/nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept';
foreach ( split(/ /, Project('LIBPATH')) ) {
$vc_link_release .= " /libpath:$_\\Release";
$vc_link_debug .= " /libpath:$_\\Debug";
}
$vc_cpp_def_common = '/D "WIN32" /D "_WINDOWS" ' . $UNICODE_FLAGS . $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_release = '/D "NDEBUG" ' . $vc_cpp_def_common;
$vc_cpp_def_debug = '/D "_DEBUG" ' . $vc_cpp_def_common; $vc_cpp_def_debug = '/D "_DEBUG" ' . $vc_cpp_def_common;
@@ -102,8 +106,8 @@
$vc_base_libs = 'kernel32.lib user32.lib advapi32.lib '; $vc_base_libs = 'kernel32.lib user32.lib advapi32.lib ';
if ( Config("wx") ) { if ( Config("wx") ) {
$vc_base_libs .= 'wsock32.lib '; $vc_base_libs .= 'wsock32.lib ';
$vc_link_release = "$WXDIR\\Base${DLL}Release\\$DLL_OR_LIB.lib "; $vc_link_release = "$WXDIR\\BaseRelease$UNICODE$DLL\\$DLL_OR_LIB$UNICODE_SUFFIX.lib ";
$vc_link_debug = "$WXDIR\\Base${DLL}Debug\\$DLL_OR_LIB" . "d.lib "; $vc_link_debug = "$WXDIR\\BaseDebug$UNICODE$DLL\\$DLL_OR_LIB$UNICODE_SUFFIX$DEBUG_SUFFIX.lib ";
} }
$vc_link_release .= '/nologo /subsystem:console /machine:I386'; $vc_link_release .= '/nologo /subsystem:console /machine:I386';
$vc_link_debug .= '/nologo /subsystem:console /debug /machine:I386 /pdbtype:sept'; $vc_link_debug .= '/nologo /subsystem:console /debug /machine:I386 /pdbtype:sept';
@@ -112,6 +116,12 @@
$vc_cpp_def_release = '/D "NDEBUG" ' . $vc_cpp_def_common; $vc_cpp_def_release = '/D "NDEBUG" ' . $vc_cpp_def_common;
$vc_cpp_def_debug = '/D "_DEBUG" ' . $vc_cpp_def_common; $vc_cpp_def_debug = '/D "_DEBUG" ' . $vc_cpp_def_common;
} }
foreach ( split(/ /, Project('LIBPATH')) ) {
$vc_link_release .= " /libpath:$_\\Release";
$vc_link_debug .= " /libpath:$_\\Debug";
}
#! define wxWin debug flags in debug build #! define wxWin debug flags in debug build
if ( Config("wx") ) { if ( Config("wx") ) {
$vc_cpp_def_debug .= '/MDd /D "__WXDEBUG__" /D "WXDEBUG=1" '; $vc_cpp_def_debug .= '/MDd /D "__WXDEBUG__" /D "WXDEBUG=1" ';
@@ -130,7 +140,7 @@
} }
#! else: disable C++ exception handling for wxWindows #! else: disable C++ exception handling for wxWindows
$vc_cpp_opt_release = $vc_cpp_opt_common1 . '/O2 '; $vc_cpp_opt_release = $vc_cpp_opt_common1 . '/O1 ';
$vc_cpp_opt_debug = $vc_cpp_opt_common1 . '/Zi /Od '; $vc_cpp_opt_debug = $vc_cpp_opt_common1 . '/Zi /Od ';
$vc_cpp_opt_common = '/YX /FD /c'; $vc_cpp_opt_common = '/YX /FD /c';
$project{"VC_BASE_CPP_RELEASE"} = $vc_cpp_opt_release . $vc_cpp_def_release . $vc_cpp_opt_common; $project{"VC_BASE_CPP_RELEASE"} = $vc_cpp_opt_release . $vc_cpp_def_release . $vc_cpp_opt_common;
@@ -228,13 +238,13 @@ RSC=rc.exe
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0 # PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release#$ $text = "$DLL" . '"' # PROP BASE Output_Dir "Release#$ $text = "$UNICODE$DLL" . '"'
# PROP BASE Intermediate_Dir "Release#$ $text = "$DLL" . '"' # PROP BASE Intermediate_Dir "Release#$ $text = "$UNICODE$DLL" . '"'
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 0 # PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release#$ $text = "$DLL" . '"' # PROP Output_Dir "Release#$ $text = "$UNICODE$DLL" . '"'
# PROP Intermediate_Dir "Release#$ $text = "$DLL" . '"' # PROP Intermediate_Dir "Release#$ $text = "$UNICODE$DLL" . '"'
#$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0'); #$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0');
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP #$ Expand("VC_BASE_CPP_RELEASE"); # ADD BASE CPP #$ Expand("VC_BASE_CPP_RELEASE");
@@ -256,13 +266,13 @@ LINK32=link.exe
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug#$ $text = "$DLL" . '"' # PROP BASE Output_Dir "Debug#$ $text = "$UNICODE$DLL" . '"'
# PROP BASE Intermediate_Dir "Debug#$ $text = "$DLL" . '"' # PROP BASE Intermediate_Dir "Debug#$ $text = "$UNICODE$DLL" . '"'
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1 # PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug#$ $text = "$DLL" . '"' # PROP Output_Dir "Debug#$ $text = "$UNICODE$DLL" . '"'
# PROP Intermediate_Dir "Debug#$ $text = "$DLL" . '"' # PROP Intermediate_Dir "Debug#$ $text = "$UNICODE$DLL" . '"'
#$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0'); #$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0');
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP #$ Expand("VC_BASE_CPP_DEBUG"); # ADD BASE CPP #$ Expand("VC_BASE_CPP_DEBUG");