[Wxdevcenter-cvs] wxDevCenter/build wxDevCenter.bkl,1.6,1.7 wx.bkl,1.4,1.5

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

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

Modified Files:
	wxDevCenter.bkl wx.bkl 
Log Message:
Add some automatic features for unix.

Index: wx.bkl
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/build/wx.bkl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wx.bkl	5 Aug 2005 18:59:12 -0000	1.4
--- wx.bkl	6 Aug 2005 15:39:14 -0000	1.5
***************
*** 9,13 ****
  		<values>0,1</values>
  		<values-description>LIB,DLL</values-description>
! 		<default-value>0</default-value>
  		<description>
  			What type of library to build ?
--- 9,13 ----
  		<values>0,1</values>
  		<values-description>LIB,DLL</values-description>
! 		<default-value>1</default-value>
  		<description>
  			What type of library to build ?
***************
*** 45,52 ****
  	</option>
  
      <!-- wxWidgets port. -->
      <option name="WXPORTNAME">
          <values>msw,gtk,gtk2,x11,mac,os2</values>
!         <default-value>msw</default-value>
          <description>Port to use for wxWidgets library.</description>
      </option>
--- 45,60 ----
  	</option>
  
+ 
+     <set var="WXPORTNAME_DEFAULT">
+ 	<if cond="PLATFORM_WIN32=='1'">msw</if>
+ 	<if cond="PLATFORM_UNIX=='1'">gtk2</if>
+ 	<if cond="PLATFORM_MAC=='1'">mac</if>
+ 	<if cond="PLATFORM_OS2=='1'">os2</if>
+     </set>
+ 
      <!-- wxWidgets port. -->
      <option name="WXPORTNAME">
          <values>msw,gtk,gtk2,x11,mac,os2</values>
!         <default-value>$(WXPORTNAME_DEFAULT)</default-value>
          <description>Port to use for wxWidgets library.</description>
      </option>
***************
*** 106,112 ****
      <set var="WXDEF_PLATEFORM">
          <if cond="PLATFORM_WIN32=='1'">__WINDOWS__</if>
!         <if cond="PLATFORM_UNIX=='1'">__UNIX_LIKE__</if>
          <if cond="PLATFORM_MAC=='1'">__WXMAC__ </if>
!         <if cond="PLATFORM_OS2=='1'">__WXOS2__ </if>
      </set>
  
--- 114,120 ----
      <set var="WXDEF_PLATEFORM">
          <if cond="PLATFORM_WIN32=='1'">__WINDOWS__</if>
! <!--        <if cond="PLATFORM_UNIX=='1'">__UNIX_LIKE__</if>
          <if cond="PLATFORM_MAC=='1'">__WXMAC__ </if>
!         <if cond="PLATFORM_OS2=='1'">__WXOS2__ </if>-->
      </set>
  
***************
*** 204,207 ****
--- 212,221 ----
          <define>$(WXUSINGDLL)</define>
          <define>$(WXDEF_PLATEFORM)</define>
+ 	<if cond="PLATFORM_UNIX=='1'">
+ 		<cppflags>`wx-config --cppflags`</cppflags>
+ 	</if>
+ 	<if cond="PLATFORM_UNIX=='1'">
+ 		<ldflags>`wx-config --libs`</ldflags>
+ 	</if>
      </template>
  

Index: wxDevCenter.bkl
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/build/wxDevCenter.bkl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** wxDevCenter.bkl	5 Aug 2005 18:59:12 -0000	1.6
--- wxDevCenter.bkl	6 Aug 2005 15:39:14 -0000	1.7
***************
*** 6,10 ****
      <set var="DIRSPEC">
          <if cond="PLATFORM_WIN32=='1'">msw</if>
!         <if cond="PLATFORM_UNIX =='1'">unix</if>        
      </set>
  
--- 6,10 ----
      <set var="DIRSPEC">
          <if cond="PLATFORM_WIN32=='1'">msw</if>
!         <if cond="PLATFORM_UNIX=='1'">unix</if>        
      </set>
  
***************
*** 12,16 ****
      <set var="WXDOCKIT_SUFFIX">
  	<if cond="TARGETING_WIN32=='1'">$(SUFFIX)</if>
! 	<if cond="TARGETING_WIN32=='0'"></if>	
      </set>
  
--- 12,16 ----
      <set var="WXDOCKIT_SUFFIX">
  	<if cond="TARGETING_WIN32=='1'">$(SUFFIX)</if>
! 	<if cond="TARGETING_WIN32=='0'">-2.1</if>	
      </set>