|
From: Emilien K. <cur...@us...> - 2005-05-14 12:16:38
|
Update of /cvsroot/wxdevcenter/wxDevCenter/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15322/build Modified Files: install.bkl wx.bkl wxDevCenter.bkl Log Message: Transition to the new feature/plugin system based on the Element class. Index: wx.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/build/wx.bkl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wx.bkl 24 Apr 2005 16:10:56 -0000 1.2 --- wx.bkl 14 May 2005 12:15:54 -0000 1.3 *************** *** 39,43 **** <values>25, 26</values> <values-description>wx2.5.x, wx2.6.x</values-description> ! <default-value>25</default-value> <description> Version of wxWidgets. --- 39,43 ---- <values>25, 26</values> <values-description>wx2.5.x, wx2.6.x</values-description> ! <default-value>26</default-value> <description> Version of wxWidgets. *************** *** 101,104 **** --- 101,117 ---- </set> + + <!-- wxWidgets plateforms definitions. --> + <!-- Set the main definition for plateform. --> + <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> + + + <!-- wxWidgets library variable definitions. --> + <!-- wxWidgets libraries string flags. --> <set var="WXLIBPOSTFIX"> *************** *** 108,112 **** </set> - <set var="WXVERSIONTAG"> <if cond="WXVER=='25'">25</if> --- 121,124 ---- *************** *** 188,191 **** --- 200,204 ---- <debug-runtime-libs>$(DEBUGRUNTIME)</debug-runtime-libs> <define>$(WXUSINGDLL)</define> + <define>$(WXDEF_PLATEFORM)</define> </template> Index: install.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/build/install.bkl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** install.bkl 24 Apr 2005 16:10:56 -0000 1.1 --- install.bkl 14 May 2005 12:15:53 -0000 1.2 *************** *** 15,18 **** --- 15,19 ---- wxDevCenter/Config.h wxDevCenter/DocView.h + wxDevCenter/Element.h wxDevCenter/FileSystem.h wxDevCenter/FileSystemCtrl.h Index: wxDevCenter.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/build/wxDevCenter.bkl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxDevCenter.bkl 24 Apr 2005 16:10:56 -0000 1.1 --- wxDevCenter.bkl 14 May 2005 12:15:54 -0000 1.2 *************** *** 16,20 **** <lib id="specific" template="wxLib"> <include>include</include> ! <sources> src/$(DIRSPEC)/Config.cpp --- 16,21 ---- <lib id="specific" template="wxLib"> <include>include</include> ! <dirname>./bin</dirname> ! <sources> src/$(DIRSPEC)/Config.cpp *************** *** 27,35 **** </lib> ! ! <exe id="wxDevCenter" template="wxEXE"> ! <app-type>gui</app-type> ! <exename>wxDevCenter$(SUFFIX)</exename> <depends>specific</depends> <library>specific</library> --- 28,37 ---- </lib> + <dll id="wxDevCenterLib" template="wxDLL"> + <dllname>wxDevCenterLib</dllname> + <libname>wxDevCenterLib</libname> + <version>0.3.0</version> ! <dirname>./bin</dirname> <depends>specific</depends> <library>specific</library> *************** *** 44,47 **** --- 46,50 ---- src/DocType.cpp src/Document.cpp + src/Element.cpp src/FileSystem.cpp src/FileSystemCtrl.cpp *************** *** 59,68 **** src/WorkBar.cpp </sources> ! <!-- <win32-res>res-win32/wxDevCenter.rc</win32-res> --> ! <!-- <win32-res>res-win32/wxDevCenter.fragment.manifest</win32-res> --> <wxlib /> <wxlib-base>xml</wxlib-base> <wxlib-gui>adv</wxlib-gui> <install-to>$(BINDIR)</install-to> --- 62,97 ---- src/WorkBar.cpp </sources> ! <wxlib /> ! <wxlib-base>xml</wxlib-base> ! <wxlib-gui>core</wxlib-gui> ! <wxlib-gui>adv</wxlib-gui> ! <wxlib-gui>fl</wxlib-gui> ! ! <install-to>$(LIBDIR)</install-to> ! </dll> ! ! ! <exe id="wxDevCenter" template="wxEXE"> ! <app-type>gui</app-type> ! <exename>wxDevCenter$(SUFFIX)</exename> ! ! <depends>wxDevCenterLib</depends> ! <library>wxDevCenterLib</library> ! <dirname>./bin</dirname> ! ! <include>include</include> ! ! <sources> ! src/AppImpl.cpp ! </sources> ! ! <win32-res>res-win32/wxDevCenter.rc</win32-res> ! <win32-res>res-win32/wxDevCenter.fragment.manifest</win32-res> <wxlib /> <wxlib-base>xml</wxlib-base> + <wxlib-gui>core</wxlib-gui> <wxlib-gui>adv</wxlib-gui> + <wxlib-gui>fl</wxlib-gui> <install-to>$(BINDIR)</install-to> |