X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/85f7ec579ec34fdcfd5d7cc827b74249742cb410..ba7fe276d4606f96352a468dbad872aa48932d8c:/distrib/msw/tmake/vc6app.t diff --git a/distrib/msw/tmake/vc6app.t b/distrib/msw/tmake/vc6app.t index 5caf700673..9ceace9bb1 100644 --- a/distrib/msw/tmake/vc6app.t +++ b/distrib/msw/tmake/vc6app.t @@ -3,9 +3,11 @@ #! Purpose: tmake template file from which the VC++ 6.0 project file for #! building wxWindows applications are generated by running #! tmake -t vc6lib wxwin.pro -o wxvc.dsp -#! you may append CONFIG+= to the end of the line, i.e. -#! tmake -t vc6lib wxwin.pro -o wxvc.dsp CONFIG+=unicode -#! tmake -t vc6lib wxwin.pro -o wxvc.dsp CONFIG+=dll +#! you may select the configurations to include into the generated +#! project file by setting WXCONFIGS tag, i.e.: +#! tmake ... 'WXCONFIGS += DebugUnicode ReleaseUnicode' +#! tmake ... 'WXCONFIGS = *' +#! (in the last example all configurations will be included) #! Author: Vadim Zeitlin #! Created: 29.09.01 #! Version: $Id$ @@ -15,28 +17,11 @@ #! output dir $KIND=""; - if ( Config("wx") ) { - Project('CONFIG += windows'); - } if ( Config("wxbase") || Config("wxuniv") ) { Project('CONFIG += wx'); } - if ( Config("wx") ) { - if ( Config("wxnodir") ) { - $WXDIR = "..\\.."; - } - else { - #! VC 6.0 supports env vars in include path - #! $WXDIR = $ENV{'WX'}; - if ( $ENV{'wx'} ) { - $WXDIR = "\$(wx)"; - } - else { - $WXDIR = "\$(WXWIN)"; - } - } - - AddIncludePath("$WXDIR\\include"); + if ( Config("wx") && !Config("wxbase") ) { + Project('CONFIG += windows'); } #! let's be smart: if no extension is given, add .lib (this allows for @@ -64,7 +49,7 @@ } else { $project{"VC_PROJ_TYPE"} = 'Win32 (x86) Console Application'; $project{"VC_PROJ_CODE"} = '0x0103'; - $vc_base_libs = 'kernel32.lib user32.lib advapi32.lib '; + $vc_base_libs = 'kernel32.lib user32.lib advapi32.lib shell32.lib '; if ( Config("wx") ) { $vc_base_libs .= 'wsock32.lib '; } @@ -83,6 +68,24 @@ } if ( Config("wx") ) { + #! default rel path works for all the demos and most of the samples + #! if no explicit path given + $WXDIR = Project("WXDIR") || (Project("WXDIRREL") || "..\\.."); + + AddIncludePath("$WXDIR\\include"); + + if ( !Project('WXCONFIGS') ) { + #! default value + Project('WXCONFIGS = Debug Release DebugDll ReleaseDll'); + } + elsif ( Project('WXCONFIGS') == '*' ) { + #! special value: generate all configs + Project('WXCONFIGS = Debug Release DebugDll ReleaseDll DebugUnicode ReleaseUnicode DebugUnicodeDll ReleaseUnicodeDll'); + } + + #! we must use !IF the first time but !ELSEIF the subsequent ones + Project('__IF = !IF'); + if ( Config("wxbase") ) { $KIND="Base"; $TOOLKIT="base"; @@ -98,6 +101,7 @@ $WX_BASENAME = "$WXDIR\\lib\\wx$TOOLKIT"; $UNICODE_SUFFIX = "u"; $DEBUG_SUFFIX = "d"; + $DLL = "dll"; #! compiler options: for the given configuration they are just obrained #! by concatenating together all relevant values from the list below @@ -132,7 +136,7 @@ #! the wxWin lib name itself is composed from the basename with various #! suffixes: 'u' for Unicode, 'd' for debug and we also need the version #! for the DLL - $DLL_VERSION = "232"; + $DLL_VERSION = "233"; $project{"WX_LINK_DEBUG"} = $DEBUG_EXTRA_LIBS . "$WX_BASENAME$DEBUG_SUFFIX.lib"; $project{"WX_LINK_RELEASE"} = $RELEASE_EXTRA_LIBS . "$WX_BASENAME.lib"; @@ -163,7 +167,7 @@ if ( $text ne "" ) { $vc_def = $text . " "; $text = ""; } else { $vc_def = ""; } if ( Config("wx") ) { #! define wxWindows compilation flags - $vc_def .= '/D WIN32 /D WINVER=0x400 /D _MT '; + $vc_def .= '/D WIN32 /D WINVER=0x400 '; if ( Config("wxbase") ) { $vc_def .= '/D wxUSE_GUI=0 '; @@ -237,14 +241,30 @@ CFG=#$ Substitute('$$TARGET - Win32 Debug'); !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE #$ Substitute('"$$TARGET - Win32 Debug" (based on "$$VC_PROJ_TYPE")'); -!MESSAGE #$ Substitute('"$$TARGET - Win32 Release" (based on "$$VC_PROJ_TYPE")'); -!MESSAGE #$ Substitute('"$$TARGET - Win32 Debug DLL" (based on "$$VC_PROJ_TYPE")'); -!MESSAGE #$ Substitute('"$$TARGET - Win32 Release DLL" (based on "$$VC_PROJ_TYPE")'); -!MESSAGE #$ Substitute('"$$TARGET - Win32 Debug Unicode" (based on "$$VC_PROJ_TYPE")'); -!MESSAGE #$ Substitute('"$$TARGET - Win32 Release Unicode" (based on "$$VC_PROJ_TYPE")'); -!MESSAGE #$ Substitute('"$$TARGET - Win32 Debug Unicode DLL" (based on "$$VC_PROJ_TYPE")'); +#$ Project('WXCONFIGS') =~ '\bReleaseUnicodeDll\b' || DisableOutput() !MESSAGE #$ Substitute('"$$TARGET - Win32 Release Unicode DLL" (based on "$$VC_PROJ_TYPE")'); +#$ Project('WXCONFIGS') =~ '\bReleaseUnicodeDll\b' || EnableOutput() +#$ Project('WXCONFIGS') =~ '\bDebugUnicodeDll\b' || DisableOutput() +!MESSAGE #$ Substitute('"$$TARGET - Win32 Debug Unicode DLL" (based on "$$VC_PROJ_TYPE")'); +#$ Project('WXCONFIGS') =~ '\bDebugUnicodeDll\b' || EnableOutput() +#$ Project('WXCONFIGS') =~ '\bUnicodeDll\b' || DisableOutput() +!MESSAGE #$ Substitute('"$$TARGET - Win32 Release Unicode" (based on "$$VC_PROJ_TYPE")'); +#$ Project('WXCONFIGS') =~ '\bUnicodeDll\b' || EnableOutput() +#$ Project('WXCONFIGS') =~ '\bDebugUnicode\b' || DisableOutput() +!MESSAGE #$ Substitute('"$$TARGET - Win32 Debug Unicode" (based on "$$VC_PROJ_TYPE")'); +#$ Project('WXCONFIGS') =~ '\bDebugUnicode\b' || EnableOutput() +#$ Project('WXCONFIGS') =~ '\bReleaseDll\b' || DisableOutput() +!MESSAGE #$ Substitute('"$$TARGET - Win32 Release DLL" (based on "$$VC_PROJ_TYPE")'); +#$ Project('WXCONFIGS') =~ '\bReleaseDll\b' || EnableOutput() +#$ Project('WXCONFIGS') =~ '\bDebugDll\b' || DisableOutput() +!MESSAGE #$ Substitute('"$$TARGET - Win32 Debug DLL" (based on "$$VC_PROJ_TYPE")'); +#$ Project('WXCONFIGS') =~ '\bDebugDll\b' || EnableOutput() +#$ Project('WXCONFIGS') =~ '\bRelease\b' || DisableOutput() +!MESSAGE #$ Substitute('"$$TARGET - Win32 Release" (based on "$$VC_PROJ_TYPE")'); +#$ Project('WXCONFIGS') =~ '\bRelease\b' || EnableOutput() +#$ Project('WXCONFIGS') =~ '\bDebug\b' || DisableOutput() +!MESSAGE #$ Substitute('"$$TARGET - Win32 Debug" (based on "$$VC_PROJ_TYPE")'); +#$ Project('WXCONFIGS') =~ '\bDebug\b' || EnableOutput() !MESSAGE # Begin Project @@ -254,49 +274,22 @@ CPP=cl.exe #$ Config("windows") && ($text='MTL=midl.exe'); RSC=rc.exe -!IF "$(CFG)" == #$ Substitute('"$$TARGET - Win32 Debug"'); - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir #$ $text = "\"${KIND}Debug\"" -# PROP BASE Intermediate_Dir #$ $text = "\"${KIND}Debug\"" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir #$ $text = "\"${KIND}Debug\"" -# PROP Intermediate_Dir #$ $text = "\"${KIND}Debug\"" -#$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0'); -# PROP Target_Dir "" -# ADD BASE CPP #$ Expand("VC_BASE_CPP_DEBUG"); -# ADD CPP #$ $text = "'$project{'VC_CPP_DEBUG'} $project{'WX_CPP_DEBUG'} $project{'WX_SETUPH_DEBUG'}'"; -#$ Config("windows") || DisableOutput(); -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 -#$ Config("windows") || EnableOutput(); -# ADD BASE RSC /l 0x409 /d "_DEBUG" #$ Expand("VC_CPP_INCLUDE"); -# ADD RSC /l 0x409 /d "_DEBUG" #$ Expand("VC_CPP_INCLUDE"); -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 #$ Expand("VC_BASE_LINK_DEBUG"); -# ADD LINK32 #$ $text = "$project{'VC_LINK_DEBUG'} $project{'WX_LINK_DEBUG'}"; - -!ELSEIF "$(CFG)" == #$ Substitute('"$$TARGET - Win32 Release"'); +#$ if ( Project('WXCONFIGS') !~ '\bReleaseUnicodeDll\b' ) { Project('__IF = !ELSEIF'); DisableOutput() }; +#$ Substitute('$$__IF "$(CFG)" == "$$TARGET - Win32 Release Unicode DLL"'); # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir #$ $text = "\"${KIND}Release\"" -# PROP BASE Intermediate_Dir #$ $text = "\"${KIND}Release\"" +# PROP BASE Output_Dir #$ $text = "\"${KIND}ReleaseUnicodeDll\"" +# PROP BASE Intermediate_Dir #$ $text = "\"${KIND}ReleaseUnicodeDll\"" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir #$ $text = "\"${KIND}Release\"" -# PROP Intermediate_Dir #$ $text = "\"${KIND}Release\"" +# PROP Output_Dir #$ $text = "\"${KIND}ReleaseUnicodeDll\"" +# PROP Intermediate_Dir #$ $text = "\"${KIND}ReleaseUnicodeDll\"" #$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0'); # PROP Target_Dir "" # ADD BASE CPP #$ Expand("VC_BASE_CPP_RELEASE"); -# ADD CPP #$ $text = "$project{'VC_CPP_RELEASE'} $project{'WX_CPP_RELEASE'} $project{'WX_SETUPH_RELEASE'}"; +# ADD CPP #$ $text = "$project{'VC_CPP_RELEASE'} $project{'WX_CPP_RELEASE'} $project{'WX_CPP_DLL'} $project{'WX_CPP_UNICODE'} $project{'WX_SETUPH_RELEASE_UNICODE_DLL'}"; #$ Config("windows") || DisableOutput(); # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 @@ -308,23 +301,25 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 #$ Expand("VC_BASE_LINK_RELEASE"); -# ADD LINK32 #$ $text = "$project{'VC_LINK_RELEASE'} $project{'WX_LINK_RELEASE'}"; +# ADD LINK32 #$ $text = "$project{'VC_LINK_RELEASE'} $project{'WX_LINK_RELEASE_UNICODE_DLL'}"; -!ELSEIF "$(CFG)" == #$ Substitute('"$$TARGET - Win32 Debug DLL"'); +#$ Project('WXCONFIGS') =~ '\bReleaseUnicodeDll\b' || EnableOutput() +#$ if ( Project('WXCONFIGS') !~ '\bDebugUnicodeDll\b' ) { Project('__IF = !ELSEIF'); DisableOutput() }; +#$ Substitute(' $$__IF "$(CFG)" == "$$TARGET - Win32 Debug Unicode DLL"'); # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir #$ $text = "\"${KIND}DebugDll\"" -# PROP BASE Intermediate_Dir #$ $text = "\"${KIND}DebugDll\"" +# PROP BASE Output_Dir #$ $text = "\"${KIND}DebugUnicodeDll\"" +# PROP BASE Intermediate_Dir #$ $text = "\"${KIND}DebugUnicodeDll\"" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir #$ $text = "\"${KIND}DebugDll\"" -# PROP Intermediate_Dir #$ $text = "\"${KIND}DebugDll\"" +# PROP Output_Dir #$ $text = "\"${KIND}DebugUnicodeDll\"" +# PROP Intermediate_Dir #$ $text = "\"${KIND}DebugUnicodeDll\"" #$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0'); # PROP Target_Dir "" # ADD BASE CPP #$ Expand("VC_BASE_CPP_DEBUG"); -# ADD CPP #$ $text = "$project{'VC_CPP_DEBUG'} $project{'WX_CPP_DEBUG'} $project{'WX_CPP_DLL'} $project{'WX_SETUPH_DEBUG_DLL'}"; +# ADD CPP #$ $text = "$project{'VC_CPP_DEBUG'} $project{'WX_CPP_DEBUG'} $project{'WX_CPP_DLL'} $project{'WX_CPP_UNICODE'} $project{'WX_SETUPH_DEBUG_UNICODE_DLL'}"; #$ Config("windows") || DisableOutput(); # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 @@ -336,23 +331,25 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 #$ Expand("VC_BASE_LINK_DEBUG"); -# ADD LINK32 #$ $text = "$project{'VC_LINK_DEBUG'} $project{'WX_LINK_DEBUG_DLL'}"; +# ADD LINK32 #$ $text = "$project{'VC_LINK_DEBUG'} $project{'WX_LINK_DEBUG_UNICODE_DLL'}"; -!ELSEIF "$(CFG)" == #$ Substitute('"$$TARGET - Win32 Release DLL"'); +#$ Project('WXCONFIGS') =~ '\bDebugUnicodeDll\b' || EnableOutput() +#$ if ( Project('WXCONFIGS') !~ '\bReleaseUnicode\b' ) { Project('__IF = !ELSEIF'); DisableOutput() }; +#$ Substitute(' $$__IF "$(CFG)" == "$$TARGET - Win32 Release Unicode"'); # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir #$ $text = "\"${KIND}ReleaseDll\"" -# PROP BASE Intermediate_Dir #$ $text = "\"${KIND}ReleaseDll\"" +# PROP BASE Output_Dir #$ $text = "\"${KIND}ReleaseUnicode\"" +# PROP BASE Intermediate_Dir #$ $text = "\"${KIND}ReleaseUnicode\"" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir #$ $text = "\"${KIND}ReleaseDll\"" -# PROP Intermediate_Dir #$ $text = "\"${KIND}ReleaseDll\"" +# PROP Output_Dir #$ $text = "\"${KIND}ReleaseUnicode\"" +# PROP Intermediate_Dir #$ $text = "\"${KIND}ReleaseUnicode\"" #$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0'); # PROP Target_Dir "" # ADD BASE CPP #$ Expand("VC_BASE_CPP_RELEASE"); -# ADD CPP #$ $text = "$project{'VC_CPP_RELEASE'} $project{'WX_CPP_RELEASE'} $project{'WX_CPP_DLL'} $project{'WX_SETUPH_RELEASE_DLL'}"; +# ADD CPP #$ $text = "$project{'VC_CPP_RELEASE'} $project{'WX_CPP_RELEASE'} $project{'WX_CPP_UNICODE'} $project{'WX_SETUPH_RELEASE_UNICODE'}"; #$ Config("windows") || DisableOutput(); # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 @@ -364,9 +361,11 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 #$ Expand("VC_BASE_LINK_RELEASE"); -# ADD LINK32 #$ $text = "$project{'VC_LINK_RELEASE'} $project{'WX_LINK_RELEASE_DLL'}"; +# ADD LINK32 #$ $text = "$project{'VC_LINK_RELEASE'} $project{'WX_LINK_RELEASE_UNICODE'}"; -!ELSEIF "$(CFG)" == #$ Substitute('"$$TARGET - Win32 Debug Unicode"'); +#$ Project('WXCONFIGS') =~ '\bReleaseUnicode\b' || EnableOutput() +#$ if ( Project('WXCONFIGS') !~ '\bDebugUnicode\b' ) { Project('__IF = !ELSEIF'); DisableOutput() }; +#$ Substitute(' $$__IF "$(CFG)" == "$$TARGET - Win32 Debug Unicode"'); # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -394,21 +393,23 @@ LINK32=link.exe # ADD BASE LINK32 #$ Expand("VC_BASE_LINK_DEBUG"); # ADD LINK32 #$ $text = "$project{'VC_LINK_DEBUG'} $project{'WX_LINK_DEBUG_UNICODE'}"; -!ELSEIF "$(CFG)" == #$ Substitute('"$$TARGET - Win32 Release Unicode"'); +#$ Project('WXCONFIGS') =~ '\bDebugUnicode\b' || EnableOutput() +#$ if ( Project('WXCONFIGS') !~ '\bReleaseDll\b' ) { Project('__IF = !ELSEIF'); DisableOutput() }; +#$ Substitute(' $$__IF "$(CFG)" == "$$TARGET - Win32 Release DLL"'); # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir #$ $text = "\"${KIND}ReleaseUnicode\"" -# PROP BASE Intermediate_Dir #$ $text = "\"${KIND}ReleaseUnicode\"" +# PROP BASE Output_Dir #$ $text = "\"${KIND}ReleaseDll\"" +# PROP BASE Intermediate_Dir #$ $text = "\"${KIND}ReleaseDll\"" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir #$ $text = "\"${KIND}ReleaseUnicode\"" -# PROP Intermediate_Dir #$ $text = "\"${KIND}ReleaseUnicode\"" +# PROP Output_Dir #$ $text = "\"${KIND}ReleaseDll\"" +# PROP Intermediate_Dir #$ $text = "\"${KIND}ReleaseDll\"" #$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0'); # PROP Target_Dir "" # ADD BASE CPP #$ Expand("VC_BASE_CPP_RELEASE"); -# ADD CPP #$ $text = "$project{'VC_CPP_RELEASE'} $project{'WX_CPP_RELEASE'} $project{'WX_CPP_UNICODE'} $project{'WX_SETUPH_RELEASE_UNICODE'}"; +# ADD CPP #$ $text = "$project{'VC_CPP_RELEASE'} $project{'WX_CPP_RELEASE'} $project{'WX_CPP_DLL'} $project{'WX_SETUPH_RELEASE_DLL'}"; #$ Config("windows") || DisableOutput(); # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 @@ -420,23 +421,25 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 #$ Expand("VC_BASE_LINK_RELEASE"); -# ADD LINK32 #$ $text = "$project{'VC_LINK_RELEASE'} $project{'WX_LINK_RELEASE_UNICODE'}"; +# ADD LINK32 #$ $text = "$project{'VC_LINK_RELEASE'} $project{'WX_LINK_RELEASE_DLL'}"; -!ELSEIF "$(CFG)" == #$ Substitute('"$$TARGET - Win32 Debug Unicode DLL"'); +#$ Project('WXCONFIGS') =~ '\bReleaseDll\b' || EnableOutput() +#$ if ( Project('WXCONFIGS') !~ '\bDebugDll\b' ) { Project('__IF = !ELSEIF'); DisableOutput() }; +#$ Substitute(' $$__IF "$(CFG)" == "$$TARGET - Win32 Debug DLL"'); # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir #$ $text = "\"${KIND}DebugUnicodeDll\"" -# PROP BASE Intermediate_Dir #$ $text = "\"${KIND}DebugUnicodeDll\"" +# PROP BASE Output_Dir #$ $text = "\"${KIND}DebugDll\"" +# PROP BASE Intermediate_Dir #$ $text = "\"${KIND}DebugDll\"" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir #$ $text = "\"${KIND}DebugUnicodeDll\"" -# PROP Intermediate_Dir #$ $text = "\"${KIND}DebugUnicodeDll\"" +# PROP Output_Dir #$ $text = "\"${KIND}DebugDll\"" +# PROP Intermediate_Dir #$ $text = "\"${KIND}DebugDll\"" #$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0'); # PROP Target_Dir "" # ADD BASE CPP #$ Expand("VC_BASE_CPP_DEBUG"); -# ADD CPP #$ $text = "$project{'VC_CPP_DEBUG'} $project{'WX_CPP_DEBUG'} $project{'WX_CPP_DLL'} $project{'WX_CPP_UNICODE'} $project{'WX_SETUPH_DEBUG_UNICODE_DLL'}"; +# ADD CPP #$ $text = "$project{'VC_CPP_DEBUG'} $project{'WX_CPP_DEBUG'} $project{'WX_CPP_DLL'} $project{'WX_SETUPH_DEBUG_DLL'}"; #$ Config("windows") || DisableOutput(); # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 @@ -448,23 +451,25 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 #$ Expand("VC_BASE_LINK_DEBUG"); -# ADD LINK32 #$ $text = "$project{'VC_LINK_DEBUG'} $project{'WX_LINK_DEBUG_UNICODE_DLL'}"; +# ADD LINK32 #$ $text = "$project{'VC_LINK_DEBUG'} $project{'WX_LINK_DEBUG_DLL'}"; -!ELSEIF "$(CFG)" == #$ Substitute('"$$TARGET - Win32 Release Unicode DLL"'); +#$ Project('WXCONFIGS') =~ '\bDebugDll\b' || EnableOutput() +#$ if ( Project('WXCONFIGS') !~ '\bRelease\b' ) { Project('__IF = !ELSEIF'); DisableOutput() }; +#$ Substitute(' $$__IF "$(CFG)" == "$$TARGET - Win32 Release"'); # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir #$ $text = "\"${KIND}ReleaseUnicodeDll\"" -# PROP BASE Intermediate_Dir #$ $text = "\"${KIND}ReleaseUnicodeDll\"" +# PROP BASE Output_Dir #$ $text = "\"${KIND}Release\"" +# PROP BASE Intermediate_Dir #$ $text = "\"${KIND}Release\"" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir #$ $text = "\"${KIND}ReleaseUnicodeDll\"" -# PROP Intermediate_Dir #$ $text = "\"${KIND}ReleaseUnicodeDll\"" +# PROP Output_Dir #$ $text = "\"${KIND}Release\"" +# PROP Intermediate_Dir #$ $text = "\"${KIND}Release\"" #$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0'); # PROP Target_Dir "" # ADD BASE CPP #$ Expand("VC_BASE_CPP_RELEASE"); -# ADD CPP #$ $text = "$project{'VC_CPP_RELEASE'} $project{'WX_CPP_RELEASE'} $project{'WX_CPP_DLL'} $project{'WX_CPP_UNICODE'} $project{'WX_SETUPH_RELEASE_UNICODE_DLL'}"; +# ADD CPP #$ $text = "$project{'VC_CPP_RELEASE'} $project{'WX_CPP_RELEASE'} $project{'WX_SETUPH_RELEASE'}"; #$ Config("windows") || DisableOutput(); # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 @@ -476,20 +481,67 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 #$ Expand("VC_BASE_LINK_RELEASE"); -# ADD LINK32 #$ $text = "$project{'VC_LINK_RELEASE'} $project{'WX_LINK_RELEASE_UNICODE_DLL'}"; +# ADD LINK32 #$ $text = "$project{'VC_LINK_RELEASE'} $project{'WX_LINK_RELEASE'}"; + +#$ Project('WXCONFIGS') =~ '\bRelease\b' || EnableOutput() +#$ if ( Project('WXCONFIGS') !~ '\bDebug\b' ) { Project('__IF = !ELSEIF'); DisableOutput() }; +#$ Substitute(' $$__IF "$(CFG)" == "$$TARGET - Win32 Debug"'); + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir #$ $text = "\"${KIND}Debug\"" +# PROP BASE Intermediate_Dir #$ $text = "\"${KIND}Debug\"" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir #$ $text = "\"${KIND}Debug\"" +# PROP Intermediate_Dir #$ $text = "\"${KIND}Debug\"" +#$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0'); +# PROP Target_Dir "" +# ADD BASE CPP #$ Expand("VC_BASE_CPP_DEBUG"); +# ADD CPP #$ $text = "$project{'VC_CPP_DEBUG'} $project{'WX_CPP_DEBUG'} $project{'WX_SETUPH_DEBUG'}"; +#$ Config("windows") || DisableOutput(); +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 +#$ Config("windows") || EnableOutput(); +# ADD BASE RSC /l 0x409 /d "_DEBUG" #$ Expand("VC_CPP_INCLUDE"); +# ADD RSC /l 0x409 /d "_DEBUG" #$ Expand("VC_CPP_INCLUDE"); +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 #$ Expand("VC_BASE_LINK_DEBUG"); +# ADD LINK32 #$ $text = "$project{'VC_LINK_DEBUG'} $project{'WX_LINK_DEBUG'}"; +#$ Project('WXCONFIGS') =~ '\bDebug\b' || EnableOutput() !ENDIF # Begin Target -# Name #$ Substitute('"$$TARGET - Win32 Debug"'); -# Name #$ Substitute('"$$TARGET - Win32 Release"'); -# Name #$ Substitute('"$$TARGET - Win32 Debug DLL"'); -# Name #$ Substitute('"$$TARGET - Win32 Release DLL"'); -# Name #$ Substitute('"$$TARGET - Win32 Debug Unicode"'); -# Name #$ Substitute('"$$TARGET - Win32 Release Unicode"'); -# Name #$ Substitute('"$$TARGET - Win32 Debug Unicode DLL"'); +#$ Project('WXCONFIGS') =~ '\bReleaseUnicodeDll\b' || DisableOutput() # Name #$ Substitute('"$$TARGET - Win32 Release Unicode DLL"'); +#$ Project('WXCONFIGS') =~ '\bReleaseUnicodeDll\b' || EnableOutput() +#$ Project('WXCONFIGS') =~ '\bDebugUnicodeDll\b' || DisableOutput() +# Name #$ Substitute('"$$TARGET - Win32 Debug Unicode DLL"'); +#$ Project('WXCONFIGS') =~ '\bDebugUnicodeDll\b' || EnableOutput() +#$ Project('WXCONFIGS') =~ '\bUnicodeDll\b' || DisableOutput() +# Name #$ Substitute('"$$TARGET - Win32 Release Unicode"'); +#$ Project('WXCONFIGS') =~ '\bUnicodeDll\b' || EnableOutput() +#$ Project('WXCONFIGS') =~ '\bDebugUnicode\b' || DisableOutput() +# Name #$ Substitute('"$$TARGET - Win32 Debug Unicode"'); +#$ Project('WXCONFIGS') =~ '\bDebugUnicode\b' || EnableOutput() +#$ Project('WXCONFIGS') =~ '\bReleaseDll\b' || DisableOutput() +# Name #$ Substitute('"$$TARGET - Win32 Release DLL"'); +#$ Project('WXCONFIGS') =~ '\bReleaseDll\b' || EnableOutput() +#$ Project('WXCONFIGS') =~ '\bDebugDll\b' || DisableOutput() +# Name #$ Substitute('"$$TARGET - Win32 Debug DLL"'); +#$ Project('WXCONFIGS') =~ '\bDebugDll\b' || EnableOutput() +#$ Project('WXCONFIGS') =~ '\bRelease\b' || DisableOutput() +# Name #$ Substitute('"$$TARGET - Win32 Release"'); +#$ Project('WXCONFIGS') =~ '\bRelease\b' || EnableOutput() +#$ Project('WXCONFIGS') =~ '\bDebug\b' || DisableOutput() +# Name #$ Substitute('"$$TARGET - Win32 Debug"'); +#$ Project('WXCONFIGS') =~ '\bDebug\b' || EnableOutput() #${ foreach $n ( sort keys %file_names ) { $f = $file_names{$n}; @@ -504,4 +556,4 @@ LINK32=link.exe #$} # End Target # End Project -#! vi: set sta ts=8 sw=4 noet nolist tw=0 ft=make: +#! vi: set sta ts=8 sw=4 noet nolist tw=0 ft=perl: