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

[Andreas T. <cor...@us...>]

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

Modified Files:
	wxDevCenter.bkl wx.bkl 
Log Message:
Corrections related to unix.

Index: wx.bkl
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/build/wx.bkl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wx.bkl	14 May 2005 12:15:54 -0000	1.3
--- wx.bkl	5 Aug 2005 18:59:12 -0000	1.4
***************
*** 47,51 ****
      <!-- wxWidgets port. -->
      <option name="WXPORTNAME">
!         <values>msw,gtk,x11,mac,os2</values>
          <default-value>msw</default-value>
          <description>Port to use for wxWidgets library.</description>
--- 47,51 ----
      <!-- 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>
***************
*** 112,115 ****
--- 112,121 ----
  
  
+     <set var="TARGETING_WIN32">
+         <if cond="FORMAT=='autoconf' or FORMAT=='gnu'">0</if>
+         <if cond="FORMAT!='autoconf' and FORMAT!='gnu'">1</if>
+     </set>
+ 
+ 
  <!-- wxWidgets library variable definitions. -->
  
***************
*** 122,142 ****
  
      <set var="WXVERSIONTAG">
!         <if cond="WXVER=='25'">25</if>
!         <if cond="WXVER=='26'">26</if>
!     </set>
! 
!     <set var="TARGETING_WIN32">
!         <if cond="FORMAT=='autoconf' or FORMAT=='gnu'">0</if>
!         <if cond="FORMAT!='autoconf' and FORMAT!='gnu'">1</if>
      </set>
  
      <set var="WXNAMEPREFIX">
          <if cond="TARGETING_WIN32=='1'">wxbase$(WXVERSIONTAG)$(WXLIBPOSTFIX)</if>
!         <if cond="TARGETING_WIN32=='0'">wx_base</if>
      </set>
      
      <set var="WXNAMEPREFIXGUI">
          <if cond="TARGETING_WIN32=='1'">wx$(WXPORTNAME)$(WXVERSIONTAG)$(WXLIBPOSTFIX)</if>
!         <if cond="TARGETING_WIN32=='0'">wx_$(WXPORTNAME)</if>
      </set>
      
--- 128,145 ----
  
      <set var="WXVERSIONTAG">
! 	<if cond="TARGETING_WIN32=='1' and WXVER=='25'">25</if>
! 	<if cond="TARGETING_WIN32=='1' and WXVER=='26'">26</if>
! 	<if cond="TARGETING_WIN32=='0' and WXVER=='25'">2.5</if>
! 	<if cond="TARGETING_WIN32=='0' and WXVER=='26'">2.6</if>
      </set>
  
      <set var="WXNAMEPREFIX">
          <if cond="TARGETING_WIN32=='1'">wxbase$(WXVERSIONTAG)$(WXLIBPOSTFIX)</if>
!         <if cond="TARGETING_WIN32=='0'">wx_base$(WXLIBPOSTFIX)</if>
      </set>
      
      <set var="WXNAMEPREFIXGUI">
          <if cond="TARGETING_WIN32=='1'">wx$(WXPORTNAME)$(WXVERSIONTAG)$(WXLIBPOSTFIX)</if>
!         <if cond="TARGETING_WIN32=='0'">wx_$(WXPORTNAME)$(WXLIBPOSTFIX)</if>
      </set>
      
***************
*** 150,154 ****
          </if>
          <if cond="TARGETING_WIN32=='0'">
!             <sys-lib>lib$(WXNAMEPREFIX)$(WXVERSIONTAG)</sys-lib>
          </if>
      </define-tag>
--- 153,157 ----
          </if>
          <if cond="TARGETING_WIN32=='0'">
!             <sys-lib>$(WXNAMEPREFIX)-$(WXVERSIONTAG)</sys-lib>
          </if>
      </define-tag>
***************
*** 160,164 ****
          </if>
          <if cond="TARGETING_WIN32=='0'">
!             <sys-lib>lib$(WXNAMEPREFIX)_$(value)$(WXVERSIONTAG)</sys-lib>
          </if>
      </define-tag>
--- 163,167 ----
          </if>
          <if cond="TARGETING_WIN32=='0'">
!             <sys-lib>$(WXNAMEPREFIX)_$(value)-$(WXVERSIONTAG)</sys-lib>
          </if>
      </define-tag>
***************
*** 170,174 ****
          </if>
          <if cond="TARGETING_WIN32=='0'">
!             <sys-lib>lib$(WXNAMEPREFIXGUI)_$(value)$(WXVERSIONTAG)</sys-lib>
          </if>
      </define-tag>
--- 173,177 ----
          </if>
          <if cond="TARGETING_WIN32=='0'">
!             <sys-lib>$(WXNAMEPREFIXGUI)_$(value)-$(WXVERSIONTAG)</sys-lib>
          </if>
      </define-tag>
***************
*** 180,184 ****
          </if>
          <if cond="TARGETING_WIN32=='0'">
!             <sys-lib>lib$(WXNAMEPREFIX)$(WXVERSIONTAG)</sys-lib> <!-- Already in wxlib. -->
          </if>
      </define-tag>
--- 183,187 ----
          </if>
          <if cond="TARGETING_WIN32=='0'">
!             <sys-lib>$(WXNAMEPREFIX)$(WXVERSIONTAG)</sys-lib> <!-- Already in wxlib. -->
          </if>
      </define-tag>

Index: wxDevCenter.bkl
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/build/wxDevCenter.bkl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wxDevCenter.bkl	3 Aug 2005 19:20:38 -0000	1.5
--- wxDevCenter.bkl	5 Aug 2005 18:59:12 -0000	1.6
***************
*** 9,12 ****
--- 9,18 ----
      </set>
  
+     <!-- Set debug library name for wxDockIt only on windows.-->
+     <set var="WXDOCKIT_SUFFIX">
+ 	<if cond="TARGETING_WIN32=='1'">$(SUFFIX)</if>
+ 	<if cond="TARGETING_WIN32=='0'"></if>	
+     </set>
+ 
      <!-- Set the build directory. -->
      <set var="BUILDDIR">.$(DIRSEP)build$(DIRSEP)$(BUILD)</set>
***************
*** 67,71 ****
          <wxlib-gui>adv</wxlib-gui>
          <wxlib-gui>fl</wxlib-gui>
!         <sys-lib>wxdockit$(SUFFIX)</sys-lib>
         
          <win32-res>res-win32/wxDevCenter.rc</win32-res>
--- 73,77 ----
          <wxlib-gui>adv</wxlib-gui>
          <wxlib-gui>fl</wxlib-gui>
!         <sys-lib>wxdockit$(WXDOCKIT_SUFFIX)</sys-lib>
         
          <win32-res>res-win32/wxDevCenter.rc</win32-res>