From 4fcf087dda560fd1777daf802f2d834c5d9554d9 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 18 Oct 2001 00:43:52 +0000 Subject: [PATCH] create lib\...\setup.h from setup.h, not setup0.h which is not meant to be edited git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/tmake/vc6base.t | 34 +++++++++++++++++----------------- distrib/msw/tmake/vc6msw.t | 34 +++++++++++++++++----------------- src/wxBase.dsp | 34 +++++++++++++++++----------------- src/wxWindows.dsp | 34 +++++++++++++++++----------------- 4 files changed, 68 insertions(+), 68 deletions(-) diff --git a/distrib/msw/tmake/vc6base.t b/distrib/msw/tmake/vc6base.t index 68a24022f2..bca141d05a 100644 --- a/distrib/msw/tmake/vc6base.t +++ b/distrib/msw/tmake/vc6base.t @@ -317,64 +317,64 @@ SOURCE=.\msw\dummy.cpp # PROP Default_Filter "" # Begin Source File -SOURCE=..\include\wx\msw\setup0.h +SOURCE=..\include\wx\msw\setup.h !IF "$(CFG)" == "wxBase - 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/basedllu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy $(InputPath) ..\lib\basedllu\wx\setup.h # End Custom Build !ELSEIF "$(CFG)" == "wxBase - 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/basedllud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy $(InputPath) ..\lib\basedllud\wx\setup.h # End Custom Build !ELSEIF "$(CFG)" == "wxBase - 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/baseu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy $(InputPath) ..\lib\baseu\wx\setup.h # End Custom Build !ELSEIF "$(CFG)" == "wxBase - 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/baseud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy $(InputPath) ..\lib\baseud\wx\setup.h # End Custom Build !ELSEIF "$(CFG)" == "wxBase - 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/basedll/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy $(InputPath) ..\lib\basedll\wx\setup.h # End Custom Build !ELSEIF "$(CFG)" == "wxBase - 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/basedlld/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy $(InputPath) ..\lib\basedlld\wx\setup.h # End Custom Build !ELSEIF "$(CFG)" == "wxBase - 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/base/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy $(InputPath) ..\lib\base\wx\setup.h # End Custom Build !ELSEIF "$(CFG)" == "wxBase - 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/based/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy $(InputPath) ..\lib\based\wx\setup.h diff --git a/distrib/msw/tmake/vc6msw.t b/distrib/msw/tmake/vc6msw.t index 502d5a3a34..fbd9407caa 100644 --- a/distrib/msw/tmake/vc6msw.t +++ b/distrib/msw/tmake/vc6msw.t @@ -353,66 +353,66 @@ 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 # 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 # 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 # 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 # 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 # 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 # 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 # 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 diff --git a/src/wxBase.dsp b/src/wxBase.dsp index d14993979f..a83a7e5fe9 100644 --- a/src/wxBase.dsp +++ b/src/wxBase.dsp @@ -573,64 +573,64 @@ SOURCE=.\msw\gsockmsw.c # PROP Default_Filter "" # Begin Source File -SOURCE=..\include\wx\msw\setup0.h +SOURCE=..\include\wx\msw\setup.h !IF "$(CFG)" == "wxBase - 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/basedllu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy $(InputPath) ..\lib\basedllu\wx\setup.h # End Custom Build !ELSEIF "$(CFG)" == "wxBase - 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/basedllud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy $(InputPath) ..\lib\basedllud\wx\setup.h # End Custom Build !ELSEIF "$(CFG)" == "wxBase - 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/baseu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy $(InputPath) ..\lib\baseu\wx\setup.h # End Custom Build !ELSEIF "$(CFG)" == "wxBase - 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/baseud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy $(InputPath) ..\lib\baseud\wx\setup.h # End Custom Build !ELSEIF "$(CFG)" == "wxBase - 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/basedll/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy $(InputPath) ..\lib\basedll\wx\setup.h # End Custom Build !ELSEIF "$(CFG)" == "wxBase - 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/basedlld/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy $(InputPath) ..\lib\basedlld\wx\setup.h # End Custom Build !ELSEIF "$(CFG)" == "wxBase - 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/base/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy $(InputPath) ..\lib\base\wx\setup.h # End Custom Build !ELSEIF "$(CFG)" == "wxBase - 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/based/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy $(InputPath) ..\lib\based\wx\setup.h diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp index 41482b252e..f2ae4afc27 100644 --- a/src/wxWindows.dsp +++ b/src/wxWindows.dsp @@ -1397,66 +1397,66 @@ SOURCE=.\msw\ole\uuid.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 # 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 # 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 # 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 # 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 # 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 # 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 # 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 -- 2.45.2