X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/17533c89d2f1b2361ca02edfddc9d64a42b0a35b..3e43d6143ba737da833e58b8f51eb400d374cb00:/distrib/msw/tmake/vc6app.t

diff --git a/distrib/msw/tmake/vc6app.t b/distrib/msw/tmake/vc6app.t
index 067576cc61..1f572a76c0 100644
--- a/distrib/msw/tmake/vc6app.t
+++ b/distrib/msw/tmake/vc6app.t
@@ -23,18 +23,6 @@
     if ( Config("wx") && !Config("wxbase") ) {
 	Project('CONFIG += windows');
     }
-    if ( Config("wx") ) {
-	if ( Config("wxnodir") ) {
-	    #! hard code relative paths
-	    $WXDIR = "..\\..";
-	}
-	else {
-	    #! VC 6.0 supports env vars in include path
-	    $WXDIR = "\$(WXWIN)";
-	}
-
-	AddIncludePath("$WXDIR\\include");
-    }
 
     #! let's be smart: if no extension is given, add .lib (this allows for
     #! LIBS=libname in project files which map either to -l libname.lib under
@@ -61,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 ';
 	}
@@ -80,6 +68,12 @@
     }
 
     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');
@@ -107,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
@@ -141,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";
@@ -172,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 ';
@@ -252,9 +247,9 @@ CFG=#$ Substitute('$$TARGET - Win32 Debug');
 #$ 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()
+#$ Project('WXCONFIGS') =~ '\bReleaseUnicode\b' || DisableOutput()
 !MESSAGE #$ Substitute('"$$TARGET - Win32 Release Unicode" (based on "$$VC_PROJ_TYPE")');
-#$ Project('WXCONFIGS') =~ '\bUnicodeDll\b' || EnableOutput()
+#$ Project('WXCONFIGS') =~ '\bReleaseUnicode\b' || EnableOutput()
 #$ Project('WXCONFIGS') =~ '\bDebugUnicode\b' || DisableOutput()
 !MESSAGE #$ Substitute('"$$TARGET - Win32 Debug Unicode" (based on "$$VC_PROJ_TYPE")');
 #$ Project('WXCONFIGS') =~ '\bDebugUnicode\b' || EnableOutput()
@@ -279,8 +274,9 @@ CPP=cl.exe
 #$ Config("windows") && ($text='MTL=midl.exe');
 RSC=rc.exe
 
-#$ if ( Project('WXCONFIGS') !~ '\bReleaseUnicodeDll\b' ) { Project('__IF = !ELSEIF'); DisableOutput() };
+#$ Project('WXCONFIGS') =~ '\bReleaseUnicodeDll\b' || DisableOutput()
 #$ Substitute('$$__IF "$(CFG)" == "$$TARGET - Win32 Release Unicode DLL"');
+#$ Project('WXCONFIGS') =~ '\bReleaseUnicodeDll\b' && Project('__IF = !ELSEIF')
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -309,8 +305,9 @@ LINK32=link.exe
 # ADD LINK32 #$ $text = "$project{'VC_LINK_RELEASE'} $project{'WX_LINK_RELEASE_UNICODE_DLL'}";
 
 #$ Project('WXCONFIGS') =~ '\bReleaseUnicodeDll\b' || EnableOutput()
-#$ if ( Project('WXCONFIGS') !~ '\bDebugUnicodeDll\b' ) { Project('__IF = !ELSEIF'); DisableOutput() };
+#$ Project('WXCONFIGS') =~ '\bDebugUnicodeDll\b' || DisableOutput()
 #$ Substitute(' $$__IF "$(CFG)" == "$$TARGET - Win32 Debug Unicode DLL"');
+#$ Project('WXCONFIGS') =~ '\bDebugUnicodeDll\b' && Project('__IF = !ELSEIF')
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -339,8 +336,9 @@ LINK32=link.exe
 # ADD LINK32 #$ $text = "$project{'VC_LINK_DEBUG'} $project{'WX_LINK_DEBUG_UNICODE_DLL'}";
 
 #$ Project('WXCONFIGS') =~ '\bDebugUnicodeDll\b' || EnableOutput()
-#$ if ( Project('WXCONFIGS') !~ '\bReleaseUnicode\b' ) { Project('__IF = !ELSEIF'); DisableOutput() };
+#$ Project('WXCONFIGS') =~ '\bReleaseUnicode\b' || DisableOutput()
 #$ Substitute(' $$__IF "$(CFG)" == "$$TARGET - Win32 Release Unicode"');
+#$ Project('WXCONFIGS') =~ '\bReleaseUnicode\b' && Project('__IF = !ELSEIF')
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -369,8 +367,9 @@ LINK32=link.exe
 # ADD LINK32 #$ $text = "$project{'VC_LINK_RELEASE'} $project{'WX_LINK_RELEASE_UNICODE'}";
 
 #$ Project('WXCONFIGS') =~ '\bReleaseUnicode\b' || EnableOutput()
-#$ if ( Project('WXCONFIGS') !~ '\bDebugUnicode\b' ) { Project('__IF = !ELSEIF'); DisableOutput() };
+#$ Project('WXCONFIGS') =~ '\bDebugUnicode\b' || DisableOutput()
 #$ Substitute(' $$__IF "$(CFG)" == "$$TARGET - Win32 Debug Unicode"');
+#$ Project('WXCONFIGS') =~ '\bDebugUnicode\b' && Project('__IF = !ELSEIF')
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -399,8 +398,9 @@ LINK32=link.exe
 # ADD LINK32 #$ $text = "$project{'VC_LINK_DEBUG'} $project{'WX_LINK_DEBUG_UNICODE'}";
 
 #$ Project('WXCONFIGS') =~ '\bDebugUnicode\b' || EnableOutput()
-#$ if ( Project('WXCONFIGS') !~ '\bReleaseDll\b' ) { Project('__IF = !ELSEIF'); DisableOutput() };
+#$ Project('WXCONFIGS') =~ '\bReleaseDll\b' || DisableOutput()
 #$ Substitute(' $$__IF "$(CFG)" == "$$TARGET - Win32 Release DLL"');
+#$ Project('WXCONFIGS') =~ '\bReleaseDll\b' && Project('__IF = !ELSEIF')
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -429,8 +429,9 @@ LINK32=link.exe
 # ADD LINK32 #$ $text = "$project{'VC_LINK_RELEASE'} $project{'WX_LINK_RELEASE_DLL'}";
 
 #$ Project('WXCONFIGS') =~ '\bReleaseDll\b' || EnableOutput()
-#$ if ( Project('WXCONFIGS') !~ '\bDebugDll\b' ) { Project('__IF = !ELSEIF'); DisableOutput() };
+#$ Project('WXCONFIGS') =~ '\bDebugDll\b' || DisableOutput()
 #$ Substitute(' $$__IF "$(CFG)" == "$$TARGET - Win32 Debug DLL"');
+#$ Project('WXCONFIGS') =~ '\bDebugDll\b' && Project('__IF = !ELSEIF')
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -459,8 +460,9 @@ LINK32=link.exe
 # ADD LINK32 #$ $text = "$project{'VC_LINK_DEBUG'} $project{'WX_LINK_DEBUG_DLL'}";
 
 #$ Project('WXCONFIGS') =~ '\bDebugDll\b' || EnableOutput()
-#$ if ( Project('WXCONFIGS') !~ '\bRelease\b' ) { Project('__IF = !ELSEIF'); DisableOutput() };
+#$ Project('WXCONFIGS') =~ '\bRelease\b' || DisableOutput()
 #$ Substitute(' $$__IF "$(CFG)" == "$$TARGET - Win32 Release"');
+#$ Project('WXCONFIGS') =~ '\bRelease\b' && Project('__IF = !ELSEIF')
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -489,8 +491,9 @@ LINK32=link.exe
 # 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() };
+#$ Project('WXCONFIGS') =~ '\bDebug\b' || DisableOutput()
 #$ Substitute(' $$__IF "$(CFG)" == "$$TARGET - Win32 Debug"');
+#$ Project('WXCONFIGS') =~ '\bDebug\b' && Project('__IF = !ELSEIF')
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -529,9 +532,9 @@ LINK32=link.exe
 #$ Project('WXCONFIGS') =~ '\bDebugUnicodeDll\b' || DisableOutput()
 # Name #$ Substitute('"$$TARGET - Win32 Debug Unicode DLL"');
 #$ Project('WXCONFIGS') =~ '\bDebugUnicodeDll\b' || EnableOutput()
-#$ Project('WXCONFIGS') =~ '\bUnicodeDll\b' || DisableOutput()
+#$ Project('WXCONFIGS') =~ '\bReleaseUnicode\b' || DisableOutput()
 # Name #$ Substitute('"$$TARGET - Win32 Release Unicode"');
-#$ Project('WXCONFIGS') =~ '\bUnicodeDll\b' || EnableOutput()
+#$ Project('WXCONFIGS') =~ '\bReleaseUnicode\b' || EnableOutput()
 #$ Project('WXCONFIGS') =~ '\bDebugUnicode\b' || DisableOutput()
 # Name #$ Substitute('"$$TARGET - Win32 Debug Unicode"');
 #$ Project('WXCONFIGS') =~ '\bDebugUnicode\b' || EnableOutput()