[Wxdevcenter-cvs] wxDevCenter wx.bkl,1.3,1.4 wxDevCenter.bkl,1.7,1.8

[Emilien K. <cur...@us...>]

Update of /cvsroot/wxdevcenter/wxDevCenter
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23965

Modified Files:
	wx.bkl wxDevCenter.bkl 
Log Message:
autoconf/gnu

Index: wx.bkl
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/wx.bkl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wx.bkl	28 Feb 2005 20:17:24 -0000	1.3
--- wx.bkl	4 Mar 2005 16:12:27 -0000	1.4
***************
*** 20,27 ****
  <!--       for extended wxlibs use.                                 -->
  <!--                                                                -->
- <!--                                                                -->
- <!--                                                                -->
- <!--                                                                -->
- <!--                                                                -->
  <!--    4) the WXLIBS and SYSLIBS tags                              -->
  <!--                                                                -->
--- 20,23 ----
***************
*** 46,50 ****
  		<exe id="myprog" template="wxbase">
  	
! 			<if cond="FORMAT!='autoconf'">
  				<include>$(WXWIN)\include</include>
  				<include>$(WXWIN)$(WXLIBINCLUDE)</include>
--- 42,46 ----
  		<exe id="myprog" template="wxbase">
  	
! 			<if cond="FORMAT!='autoconf' and FORMAT!='gnu'">
  				<include>$(WXWIN)\include</include>
  				<include>$(WXWIN)$(WXLIBINCLUDE)</include>
***************
*** 443,448 ****
                  <sys-lib>wxbase25$(WXLIBPOSTFIX)</sys-lib>
                  
!                 <if cond="WXLIB_FL==1"><sys-lib>wxmsw25$(WXLIBPOSTFIX)_fl</sys-lib></if>
!                 <if cond="WXLIB_STC==1"><sys-lib>wxmsw25$(WXLIBPOSTFIX)_stc</sys-lib></if>
  
              </if>
--- 439,444 ----
                  <sys-lib>wxbase25$(WXLIBPOSTFIX)</sys-lib>
                  
!                 <if cond="WXLIB_FL=='1'"><sys-lib>wxmsw25$(WXLIBPOSTFIX)_fl</sys-lib></if>
!                 <if cond="WXLIB_STC=='1'"><sys-lib>wxmsw25$(WXLIBPOSTFIX)_stc</sys-lib></if>
  
              </if>
***************
*** 472,478 ****
          <!-- utilities to include the libs and defines for us.      -->
          <if cond="TARGETING_WIN32=='0'">
!             <if cond="WXLIB_FL==1"><set var="USE_WXLIB_FL">,fl</set></if>
!             <if cond="WXLIB_STC==1"><set var="USE_WXLIB_STC">,stc</set></if>
! 
              <ldflags>`wx-config --libs std$(USE_WXLIB_FL)$(USE_WXLIB_STC)`</ldflags>
          </if>
--- 468,473 ----
          <!-- utilities to include the libs and defines for us.      -->
          <if cond="TARGETING_WIN32=='0'">
!             <set var="USE_WXLIB_FL"><if cond="WXLIB_FL=='1'">,fl</if></set>
!             <set var="USE_WXLIB_STC"><if cond="WXLIB_STC=='1'">,stc</if></set>
              <ldflags>`wx-config --libs std$(USE_WXLIB_FL)$(USE_WXLIB_STC)`</ldflags>
          </if>

Index: wxDevCenter.bkl
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/wxDevCenter.bkl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** wxDevCenter.bkl	28 Feb 2005 20:17:24 -0000	1.7
--- wxDevCenter.bkl	4 Mar 2005 16:12:27 -0000	1.8
***************
*** 31,35 ****
  
      <lib id="specific" template="wxbase">
!         <if cond="FORMAT!='autoconf'">
              <include>$(WXWIN)\include</include>
              <include>$(WXWIN)$(WXLIBINCLUDE)</include>
--- 31,35 ----
  
      <lib id="specific" template="wxbase">
!         <if cond="FORMAT!='autoconf' and FORMAT!='gnu'">
              <include>$(WXWIN)\include</include>
              <include>$(WXWIN)$(WXLIBINCLUDE)</include>
***************
*** 54,58 ****
      <exe id="wxDevCenter" template="wxbase">
  
!         <if cond="FORMAT!='autoconf'">
              <include>$(WXWIN)\include</include>
              <include>$(WXWIN)$(WXLIBINCLUDE)</include>
--- 54,58 ----
      <exe id="wxDevCenter" template="wxbase">
  
!         <if cond="FORMAT!='autoconf' and FORMAT!='gnu'">
              <include>$(WXWIN)\include</include>
              <include>$(WXWIN)$(WXLIBINCLUDE)</include>