[Wxlua-commit] wxLua/build/bakefiles wxlua.bkl, 1.27, 1.28 wxluabase.bkl, 1.25, 1.26

[Francesco M. <fr...@us...>]

Update of /cvsroot/wxlua/wxLua/build/bakefiles
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7346/build/bakefiles

Modified Files:
	wxlua.bkl wxluabase.bkl 
Log Message:
Added PCH support; now output folder for binaries are configuration-dependent to avoid problems when building wxLua with different settings

Index: wxluabase.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** wxluabase.bkl	10 Dec 2006 18:04:25 -0000	1.25
--- wxluabase.bkl	11 Dec 2006 00:08:19 -0000	1.26
***************
*** 99,102 ****
--- 99,131 ----
      </set>
  
+     <!--
+         Note that for the output folder of the binaries, we need to use WXLUA_LIBPOSTFIX
+         to differentiate among the different Unicode/ANSI debug/release builds.
+         This is not necessary in the WXLUA_LIBOUTPUT_FOLDER and WXLUA_DLLOUTPUT_FOLDER vars
+         because, unlike for the executables which need to be named always the same way,
+         the library names themselves contain the WXLUA_LIBPOSTFIX.
+     -->
+     <set var="WXLUA_BINSTATIC_OUTPUT_FOLDER">
+         <if cond="TARGETING_WIN32=='1'">
+             bin/$(COMPILER)$(WXLUA_LIBPOSTFIX)_lib
+         </if>
+         <if cond="TARGETING_WIN32=='0'">
+             bin
+         </if>
+     </set>
+     <set var="WXLUA_BINSHARED_OUTPUT_FOLDER">
+         <if cond="TARGETING_WIN32=='1'">
+             bin/$(COMPILER)$(WXLUA_LIBPOSTFIX)_dll
+         </if>
+         <if cond="TARGETING_WIN32=='0'">
+             bin
+         </if>
+     </set>
+     <set var="WXLUA_BINOUTPUT_FOLDER">
+         <if cond="TARGETING_WIN32=='1' and SHARED=='1'">$(WXLUA_BINSHARED_OUTPUT_FOLDER)</if>
+         <if cond="TARGETING_WIN32=='1' and SHARED=='0'">$(WXLUA_BINSTATIC_OUTPUT_FOLDER)</if>
+         <if cond="TARGETING_WIN32=='0'">bin</if>    <!-- shared & static builds go to the same folder -->
+     </set>
+ 
      <if cond="TARGETING_WIN32=='1'">
          <set var="SUBPROJECT_POSTFIX_PATH">build/msw</set>

Index: wxlua.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxlua.bkl,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** wxlua.bkl	8 Dec 2006 13:19:58 -0000	1.27
--- wxlua.bkl	11 Dec 2006 00:08:19 -0000	1.28
***************
*** 62,66 ****
          <set var="WXLUA_LIBOUTPUT_PATH">$(WXLUA_BASEDIR)/$(WXLUA_LIBOUTPUT_FOLDER)</set>
          <set var="WXLUA_DLLOUTPUT_PATH">$(WXLUA_BASEDIR)/$(WXLUA_DLLOUTPUT_FOLDER)</set>
!         <set var="WXLUA_BINOUTPUT_PATH">$(WXLUA_BASEDIR)/bin</set>
      </if>
      <if cond="FORMAT=='autoconf'">
--- 62,66 ----
          <set var="WXLUA_LIBOUTPUT_PATH">$(WXLUA_BASEDIR)/$(WXLUA_LIBOUTPUT_FOLDER)</set>
          <set var="WXLUA_DLLOUTPUT_PATH">$(WXLUA_BASEDIR)/$(WXLUA_DLLOUTPUT_FOLDER)</set>
!         <set var="WXLUA_BINOUTPUT_PATH">$(WXLUA_BASEDIR)/$(WXLUA_BINOUTPUT_FOLDER)</set>
      </if>
      <if cond="FORMAT=='autoconf'">
***************
*** 68,83 ****
          <set var="WXLUA_LIBOUTPUT_PATH">$(top_builddir)/$(WXLUA_LIBOUTPUT_FOLDER)</set>
          <set var="WXLUA_DLLOUTPUT_PATH">$(top_builddir)/$(WXLUA_DLLOUTPUT_FOLDER)</set>
!         <set var="WXLUA_BINOUTPUT_PATH">$(top_builddir)/bin</set>
      </if>
  
      <if cond="TARGETING_IDE=='0'">
-         <if cond="TARGETING_WIN32=='1'">
-             <!-- on linux we don't need this because WXLUA_LIBOUTPUT_PATH == WXLUA_DLLOUTPUT_PATH -->
-             <mkdir id="setuplibdir">
-                 <dependency-of>all</dependency-of>
-                 <dir>$(WXLUA_LIBOUTPUT_PATH)</dir>
-             </mkdir>
-         </if>
- 
          <!-- the folders where output will be stored -->
          <mkdir id="setupdlldir">
--- 68,75 ----
          <set var="WXLUA_LIBOUTPUT_PATH">$(top_builddir)/$(WXLUA_LIBOUTPUT_FOLDER)</set>
          <set var="WXLUA_DLLOUTPUT_PATH">$(top_builddir)/$(WXLUA_DLLOUTPUT_FOLDER)</set>
!         <set var="WXLUA_BINOUTPUT_PATH">$(top_builddir)/$(WXLUA_BINOUTPUT_FOLDER)</set>
      </if>
  
      <if cond="TARGETING_IDE=='0'">
          <!-- the folders where output will be stored -->
          <mkdir id="setupdlldir">
***************
*** 89,92 ****
--- 81,92 ----
              <dir>$(WXLUA_BINOUTPUT_PATH)</dir>
          </mkdir>
+ 
+         <if cond="TARGETING_WIN32=='1'">
+             <!-- on linux we don't need this because WXLUA_LIBOUTPUT_PATH == WXLUA_DLLOUTPUT_PATH -->
+             <mkdir id="setuplibdir">
+                 <dependency-of>all</dependency-of>
+                 <dir>$(WXLUA_LIBOUTPUT_PATH)</dir>
+             </mkdir>
+         </if>
      </if>