|
From: Emilien K. <cur...@us...> - 2005-04-23 16:30:30
|
Update of /cvsroot/wxdevcenter/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25286 Modified Files: wxDevCenter.bkl Log Message: Nouvelle version du bakefile wx. Index: wxDevCenter.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/wxDevCenter.bkl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxDevCenter.bkl 16 Mar 2005 14:27:39 -0000 1.9 --- wxDevCenter.bkl 23 Apr 2005 16:30:21 -0000 1.10 *************** *** 2,22 **** <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"/> - - <using module="datafiles"/> - - <option name="WXWIN" category="path"> - <default-value>c:\wxWidgets</default-value> - <description>The wxWidgets library main folder</description> - </option> <set var="DIRSPEC"> <if cond="PLATFORM_WIN32=='1'">msw</if> --- 2,11 ---- <makefile> + <include file="build/wx.bkl" /> + <using module="datafiles" /> + <!-- Determine what plateform is used. --> <set var="DIRSPEC"> <if cond="PLATFORM_WIN32=='1'">msw</if> *************** *** 24,43 **** </set> ! <set var="DEBUGFLAG"> ! <if cond="BUILD=='debug'">d</if> ! </set> ! <lib id="specific" template="wxbase"> ! <if cond="FORMAT!='autoconf' and FORMAT!='gnu'"> ! <include>$(WXWIN)\include</include> ! <include>$(WXWIN)$(WXLIBINCLUDE)</include> ! <lib-path>$(WXWIN)$(WXLIBPATH)</lib-path> ! </if> ! <include>include</include> ! <precomp-headers>on</precomp-headers> ! <precomp-headers-header>wxDevCenter.h</precomp-headers-header> <sources> --- 13,25 ---- </set> ! <!-- Set the build directory. --> ! <set var="BUILDDIR">.$(DIRSEP)build$(DIRSEP)$(BUILD)</set> ! <lib id="specific" template="wxLib"> <include>include</include> ! <!-- <precomp-headers>on</precomp-headers> --> ! <!-- <precomp-headers-header>wxDevCenter.h</precomp-headers-header> --> <sources> *************** *** 46,73 **** </sources> ! <wxlibs/> ! <syslibs/> </lib> ! <exe id="wxDevCenter" template="wxbase"> ! ! <if cond="FORMAT!='autoconf' and FORMAT!='gnu'"> ! <include>$(WXWIN)\include</include> ! <include>$(WXWIN)$(WXLIBINCLUDE)</include> ! <lib-path>$(WXWIN)$(WXLIBPATH)</lib-path> ! </if> ! <app-type>gui</app-type> ! <exename>wxDevCenter$(DEBUGFLAG)</exename> <depends>specific</depends> <library>specific</library> - <app-type>gui</app-type> - <include>include</include> ! <precomp-headers>on</precomp-headers> ! <precomp-headers-header>wxDevCenter.h</precomp-headers-header> <sources> --- 28,47 ---- </sources> ! <wxlib /> ! <wxlib-base>xml</wxlib-base> ! <wxlib-gui>adv</wxlib-gui> </lib> ! <exe id="wxDevCenter" template="wxEXE"> <app-type>gui</app-type> ! <exename>wxDevCenter$(SUFFIX)</exename> <depends>specific</depends> <library>specific</library> <include>include</include> ! <!-- <precomp-headers>on</precomp-headers> --> ! <!-- <precomp-headers-header>wxDevCenter.h</precomp-headers-header> --> <sources> *************** *** 84,87 **** --- 58,62 ---- src/Frame.cpp src/MainFrame.cpp + src/Manager.cpp src/MDIFrame.cpp src/MiniView.cpp *************** *** 90,101 **** src/StatusBar.cpp src/View.cpp </sources> ! <win32-res>res-win32/wxDevCenter.rc</win32-res> ! <wxlibs/> ! <syslibs/> <install-to>$(BINDIR)</install-to> - </exe> --- 65,78 ---- src/StatusBar.cpp src/View.cpp + 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> </exe> *************** *** 119,122 **** --- 96,100 ---- wxDevCenter/language.h wxDevCenter/MainFrame.h + wxDevCenter/Manager.h wxDevCenter/MDIFrame.h wxDevCenter/Plugin.h *************** *** 124,127 **** --- 102,106 ---- wxDevCenter/setup.h wxDevCenter/StatusBar.h + wxDevCenter/WorkBar.h wxDevCenter/$(DIRSPEC)/Config.h wxDevCenter/$(DIRSPEC)/FileSystemStandard.h |