[Wxdevcenter-cvs] wxDevCenter wx.bkl,1.2,1.3 wxDevCenter.bkl,1.6,1.7

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

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

Modified Files:
	wx.bkl wxDevCenter.bkl 
Log Message:
Libs wx additionnelles.

Index: wx.bkl
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/wx.bkl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wx.bkl	28 Feb 2005 17:51:48 -0000	1.2
--- wx.bkl	28 Feb 2005 20:17:24 -0000	1.3
***************
*** 17,23 ****
  <!--       WXDLLINCLUDE variables                                   -->
  <!--                                                                -->
! <!--    3) the WXLIBS and SYSLIBS tags                              -->
  <!--                                                                -->
! <!--    4) the WXBASE template                                      -->
  <!--                                                                -->
  
--- 17,30 ----
  <!--       WXDLLINCLUDE variables                                   -->
  <!--                                                                -->
! <!--    3) WXLIB_FL, WXLIB_STC                                      -->
! <!--       for extended wxlibs use.                                 -->
! <!--                                                                -->
! <!--                                                                -->
! <!--                                                                -->
  <!--                                                                -->
! <!--                                                                -->
! <!--    4) the WXLIBS and SYSLIBS tags                              -->
! <!--                                                                -->
! <!--    5) the WXBASE template                                      -->
  <!--                                                                -->
  
***************
*** 142,145 ****
--- 149,159 ----
      <requires version="0.1.5"/>
  
+     <!-- These variables are used to specify if a wx contrib library is link when use <wxlibs /> tag.
+          Set to 1 if you want tou use it.
+          you should write <set var="WXLIB_FL">1</set> before including wxbase.bkl.
+     -->
+     <set var="WXLIB_FL" overwrite="0">0</set>
+     <set var="WXLIB_STC" overwrite="0">0</set>
+ 
  	<!-- these variables are used to make default values customizable
  	     from an external bakefile without touching this one: if you
***************
*** 428,431 ****
--- 442,449 ----
                  <sys-lib>wxmsw25$(WXLIBPOSTFIX)_html</sys-lib>
                  <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>
              <if cond="WX25=='0'">
***************
*** 454,461 ****
          <!-- utilities to include the libs and defines for us.      -->
          <if cond="TARGETING_WIN32=='0'">
!             <ldflags>`wx-config --libs`</ldflags>
          </if>
      </define-tag>
  
      <!-- Like the WXLIBS tag defined above, but this one declares   -->
      <!-- the standard non-wxWidgets libraries. This tag should be   -->
--- 472,483 ----
          <!-- 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>
      </define-tag>
  
+ 
      <!-- Like the WXLIBS tag defined above, but this one declares   -->
      <!-- the standard non-wxWidgets libraries. This tag should be   -->

Index: wxDevCenter.bkl
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/wxDevCenter.bkl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** wxDevCenter.bkl	28 Feb 2005 17:51:48 -0000	1.6
--- wxDevCenter.bkl	28 Feb 2005 20:17:24 -0000	1.7
***************
*** 2,5 ****
--- 2,11 ----
  <makefile>
  
+     <set var="DEFSHARED_VALUE">1</set><!-- wxDevCenter do not work in static mode. -->
+     <set var="DEFWXVER_VALUE">2_5</set><!-- wxDevCenter do not work with wx24API. -->
+ 
+     <set var="WXLIB_FL">1</set><!-- wxDevCenter require wxFrameLayout. -->
+     <set var="WXLIB_STC">1</set><!-- wxDevCenter require wxStyledTextCtrl. -->
+ 
      <include file="wx.bkl"/> 
  
***************
*** 64,68 ****
          <precomp-headers>on</precomp-headers>
          <precomp-headers-header>wxDevCenter.h</precomp-headers-header>
!     
          <sources>
              src/AboutBox.cpp
--- 70,74 ----
          <precomp-headers>on</precomp-headers>
          <precomp-headers-header>wxDevCenter.h</precomp-headers-header>
!            
          <sources>
              src/AboutBox.cpp
***************
*** 85,95 ****
              src/View.cpp
          </sources>
!         
          <wxlibs/>
          <syslibs/>
!         
! <!--        <sys-lib>$(wxlib_net)</sys-lib>
!         <sys-lib>$(wxlib_fl)</sys-lib> -->
!         
          <install-to>$(BINDIR)</install-to>
  
--- 91,99 ----
              src/View.cpp
          </sources>
!         <win32-res>res-win32/wxDevCenter.rc</win32-res>
!     
          <wxlibs/>
          <syslibs/>
!        
          <install-to>$(BINDIR)</install-to>