X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8976cbbc48b061aed2335483c05c8cc73f129945..667e2c55eab8820efc2e7dc06611724641e9bcf3:/distrib/msw/tmake/vc6msw.t diff --git a/distrib/msw/tmake/vc6msw.t b/distrib/msw/tmake/vc6msw.t index 502d5a3a34..633cb4f14f 100644 --- a/distrib/msw/tmake/vc6msw.t +++ b/distrib/msw/tmake/vc6msw.t @@ -20,7 +20,7 @@ } foreach $file (sort keys %wxCommon) { - next if $wxCommon{$file} =~ /\b16\b/; + next if $wxCommon{$file} =~ /\b(16|U)\b/; my $tag = $file =~ /\.c$/ ? "WXCSRCS" : "WXCOMMONSRCS"; $project{$tag} .= $file . " " @@ -36,7 +36,7 @@ } foreach $file (sort keys %wxHTML) { - next if $wxHTML{$file} =~ /\b16\b/; + next if $wxHTML{$file} =~ /\b(16|U)\b/; $project{"WXHTMLSRCS"} .= $file . " " } @@ -60,7 +60,7 @@ $project{"WXHTMLHEADERS"} .= $file . " " } - $project{"WXVERSION"} = "232"; + $project{"WXVERSION"} = "233"; #$} # Microsoft Developer Studio Project File - Name="wxWindows" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 @@ -94,8 +94,8 @@ CFG=wxWindows - Win32 Debug # Begin Project # PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "wxWindows" -# PROP Scc_LocalPath ".." +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" CPP=cl.exe RSC=rc.exe @@ -353,69 +353,69 @@ SOURCE=.\msw\dummy.cpp # PROP Default_Filter "" # Begin Source File -SOURCE=..\include\wx\msw\setup0.h +SOURCE=..\include\wx\msw\setup.h !IF "$(CFG)" == "wxWindows - Win32 Release Unicode DLL" -# Begin Custom Build - Creating wx/setup.h from $(InputPath) -InputPath=..\include\wx\msw\setup0.h +# Begin Custom Build - Creating $(TargetPath) from $(InputPath) +InputPath=..\include\wx\msw\setup.h "../lib/mswdllu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) ..\lib\mswdllu\wx\setup.h + copy "$(InputPath)" ..\lib\mswdllu\wx\setup.h # End Custom Build !ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL" -# Begin Custom Build - Creating wx/setup.h from $(InputPath) -InputPath=..\include\wx\msw\setup0.h +# Begin Custom Build - Creating $(TargetPath) from $(InputPath) +InputPath=..\include\wx\msw\setup.h "../lib/mswdllud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) ..\lib\mswdllud\wx\setup.h + copy "$(InputPath)" ..\lib\mswdllud\wx\setup.h # End Custom Build !ELSEIF "$(CFG)" == "wxWindows - Win32 Release Unicode" -# Begin Custom Build - Creating wx/setup.h from $(InputPath) -InputPath=..\include\wx\msw\setup0.h +# Begin Custom Build - Creating $(TargetPath) from $(InputPath) +InputPath=..\include\wx\msw\setup.h "../lib/mswu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) ..\lib\mswu\wx\setup.h + copy "$(InputPath)" ..\lib\mswu\wx\setup.h # End Custom Build !ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode" -# Begin Custom Build - Creating wx/setup.h from $(InputPath) -InputPath=..\include\wx\msw\setup0.h +# Begin Custom Build - Creating $(TargetPath) from $(InputPath) +InputPath=..\include\wx\msw\setup.h "../lib/mswud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) ..\lib\mswud\wx\setup.h + copy "$(InputPath)" ..\lib\mswud\wx\setup.h # End Custom Build !ELSEIF "$(CFG)" == "wxWindows - Win32 Release DLL" -# Begin Custom Build - Creating wx/setup.h from $(InputPath) -InputPath=..\include\wx\msw\setup0.h +# Begin Custom Build - Creating $(TargetPath) from $(InputPath) +InputPath=..\include\wx\msw\setup.h "../lib/mswdll/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) ..\lib\mswdll\wx\setup.h + copy "$(InputPath)" ..\lib\mswdll\wx\setup.h # End Custom Build !ELSEIF "$(CFG)" == "wxWindows - Win32 Debug DLL" -# Begin Custom Build - Creating wx/setup.h from $(InputPath) -InputPath=..\include\wx\msw\setup0.h +# Begin Custom Build - Creating $(TargetPath) from $(InputPath) +InputPath=..\include\wx\msw\setup.h "../lib/mswdlld/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) ..\lib\mswdlld\wx\setup.h + copy "$(InputPath)" ..\lib\mswdlld\wx\setup.h # End Custom Build !ELSEIF "$(CFG)" == "wxWindows - Win32 Release" -# Begin Custom Build - Creating wx/setup.h from $(InputPath) -InputPath=..\include\wx\msw\setup0.h +# Begin Custom Build - Creating $(TargetPath) from $(InputPath) +InputPath=..\include\wx\msw\setup.h "../lib/msw/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) ..\lib\msw\wx\setup.h + copy "$(InputPath)" ..\lib\msw\wx\setup.h # End Custom Build !ELSEIF "$(CFG)" == "wxWindows - Win32 Debug" -# Begin Custom Build - Creating wx/setup.h from $(InputPath) -InputPath=..\include\wx\msw\setup0.h +# Begin Custom Build - Creating $(TargetPath) from $(InputPath) +InputPath=..\include\wx\msw\setup.h "../lib/mswd/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) ..\lib\mswd\wx\setup.h + copy "$(InputPath)" ..\lib\mswd\wx\setup.h # End Custom Build !ENDIF