added setup.h copying to VC++ project files

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

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 450525a16dc9d83cd7e22a8bcf56c2e08532a55b..76725c181efe2d00ca6bb1f20dee4d353ee2c04c 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -279,6 +279,22 @@
             </msvc-project-files>
         </if>
     </define-tag>
             </msvc-project-files>
         </if>
     </define-tag>

+    
+    <define-tag name="msvc-copy-setup-h" rules="dll,lib">
+        <if cond="FORMAT=='msvc6prj'">
+            <msvc-headers>wx/msw/setup.h</msvc-headers>
+            <set var="__custom_build_files" append="1">
+                include\wx\msw\setup.h
+            </set>
+            <set var="__custom_build_include_wx_msw_setup_h">
+Creating $(LIBDIRNAME)\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"$(LIBDIRNAME)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
+$(TAB)copy "$(DOLLAR)(InputPath)" $(LIBDIRNAME)\wx\setup.h
+            </set>
+        </if>
+    </define-tag>

 
     <!-- for GUI libs/samples: -->
     <template id="wx_append_nomono" template="wx_append_base_nomono">
 
     <!-- for GUI libs/samples: -->
     <template id="wx_append_nomono" template="wx_append_base_nomono">

diff --git a/build/bakefiles/monolithic.bkl b/build/bakefiles/monolithic.bkl
index cd043384ac78f1ee974ab427cf31f75b7b29b43e..5a04aa477a082bbc1dcd9985926a2a16ea8ef3d6 100644 (file)
--- a/build/bakefiles/monolithic.bkl
+++ b/build/bakefiles/monolithic.bkl
@@ -14,8 +14,9 @@
         <define>wxUSE_BASE=1</define> 
         <define>WXMAKINGDLL</define>
         <sources>$(MONOLIB_SRC)</sources>
         <define>wxUSE_BASE=1</define> 
         <define>WXMAKINGDLL</define>
         <sources>$(MONOLIB_SRC)</sources>

-        <msvc-headers>$(ALL_HEADERS)</msvc-headers>

         <ldlibs>$(EXTRALIBS_XML)</ldlibs>
         <ldlibs>$(EXTRALIBS_XML)</ldlibs>

+        <msvc-headers>$(ALL_HEADERS)</msvc-headers>
+        <msvc-copy-setup-h/>

     </dll>
     
     <lib id="monolib" template="wx_lib"
     </dll>
     
     <lib id="monolib" template="wx_lib"

diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index 47e48207378881b95408aa21155202c8e7169e60..bc6d5a6b5ac0b0df22b4a27b56f7ba4c1e9c35c1 100644 (file)
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -14,6 +14,7 @@
         <define>wxUSE_GUI=0</define> 
         <sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
         <msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers>
         <define>wxUSE_GUI=0</define> 
         <sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
         <msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers>

+        <msvc-copy-setup-h/>

     </dll>
     
     <lib id="baselib" template="wx_base_lib"
     </dll>
     
     <lib id="baselib" template="wx_base_lib"