fixed setup.h copying

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23097 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/build/msw/wx_base.dsp b/build/msw/wx_base.dsp
index adc9f46078211cb471b286c135342bce43e92ed3..77188068f24807451da192a4d35b5511d87655ec 100644 (file)
--- a/build/msw/wx_base.dsp
+++ b/build/msw/wx_base.dsp
@@ -456,6 +456,10 @@ SOURCE=..\..\src\common\appbase.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\bookctrl.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\clntdata.cpp
 # End Source File
 # Begin Source File
@@ -744,161 +748,161 @@ SOURCE=..\..\include\wx\msw\setup.h
 
 !IF  "$(CFG)" == "base - Win32 Debug"
 
-# Begin Custom Build - Creating ..\..\lib\vc_lib\wx\setup.h
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
-"..\..\lib\vc_lib\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\wx\setup.h
+"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "base - Win32 Release"
 
-# Begin Custom Build - Creating ..\..\lib\vc_lib\wx\setup.h
+# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
-"..\..\lib\vc_lib\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\wx\setup.h
+"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "base - Win32 Unicode Debug"
 
-# Begin Custom Build - Creating ..\..\lib\vc_lib\wx\setup.h
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
-"..\..\lib\vc_lib\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\wx\setup.h
+"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "base - Win32 Unicode Release"
 
-# Begin Custom Build - Creating ..\..\lib\vc_lib\wx\setup.h
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
-"..\..\lib\vc_lib\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\wx\setup.h
+"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "base - Win32 Universal Debug"
 
-# Begin Custom Build - Creating ..\..\lib\vc_lib\wx\setup.h
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
-"..\..\lib\vc_lib\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\wx\setup.h
+"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "base - Win32 Universal Release"
 
-# Begin Custom Build - Creating ..\..\lib\vc_lib\wx\setup.h
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
-"..\..\lib\vc_lib\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\wx\setup.h
+"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "base - Win32 Universal Unicode Debug"
 
-# Begin Custom Build - Creating ..\..\lib\vc_lib\wx\setup.h
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
-"..\..\lib\vc_lib\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\wx\setup.h
+"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "base - Win32 Universal Unicode Release"
 
-# Begin Custom Build - Creating ..\..\lib\vc_lib\wx\setup.h
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
-"..\..\lib\vc_lib\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\wx\setup.h
+"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Debug"
 
-# Begin Custom Build - Creating ..\..\lib\vc_dll\wx\setup.h
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
-"..\..\lib\vc_dll\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\wx\setup.h
+"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Release"
 
-# Begin Custom Build - Creating ..\..\lib\vc_dll\wx\setup.h
+# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
-"..\..\lib\vc_dll\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\wx\setup.h
+"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Debug"
 
-# Begin Custom Build - Creating ..\..\lib\vc_dll\wx\setup.h
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
-"..\..\lib\vc_dll\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\wx\setup.h
+"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Release"
 
-# Begin Custom Build - Creating ..\..\lib\vc_dll\wx\setup.h
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
-"..\..\lib\vc_dll\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\wx\setup.h
+"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Debug"
 
-# Begin Custom Build - Creating ..\..\lib\vc_dll\wx\setup.h
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
-"..\..\lib\vc_dll\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\wx\setup.h
+"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Release"
 
-# Begin Custom Build - Creating ..\..\lib\vc_dll\wx\setup.h
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
-"..\..\lib\vc_dll\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\wx\setup.h
+"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Unicode Debug"
 
-# Begin Custom Build - Creating ..\..\lib\vc_dll\wx\setup.h
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
-"..\..\lib\vc_dll\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\wx\setup.h
+"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Unicode Release"
 
-# Begin Custom Build - Creating ..\..\lib\vc_dll\wx\setup.h
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
-"..\..\lib\vc_dll\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\wx\setup.h
+"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
 
 # End Custom Build
 

diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index a33d06f442f1321ec30d57935e397f34825c698b..04daf57b4b646e5d89bc5494301e056aa39cf813 100644 (file)
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -4275,10 +4275,6 @@ SOURCE=..\..\src\generic\imaglist.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\listbkg.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\generic\listctrl.cpp
 
 !IF  "$(CFG)" == "core - Win32 Debug"