|
From: Emilien K. <cur...@us...> - 2005-05-14 12:45:42
|
Update of /cvsroot/wxdevcenter/StdPlugin/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20640/build Modified Files: StdPlugin.bkl wx.bkl Log Message: Transition to the new feature/plugin system based on the Element class. Index: wx.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/build/wx.bkl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wx.bkl 25 Apr 2005 15:40:14 -0000 1.1 --- wx.bkl 14 May 2005 12:45:32 -0000 1.2 *************** *** 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: StdPlugin.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/build/StdPlugin.bkl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** StdPlugin.bkl 25 Apr 2005 15:40:14 -0000 1.1 --- StdPlugin.bkl 14 May 2005 12:45:29 -0000 1.2 *************** *** 2,15 **** <makefile> - <set var="PATHTOWXDC"> - ../wxDevCenter - </set> <dll id="Text" template="wxDLL"> <libname>StdPlugin.Text$(SUFFIX)</libname> ! <include>include</include> - <include>$(PATHTOWXDC)/include</include> <sources> src/Controls.cpp --- 2,30 ---- <makefile> + <set var="BUILDDIR">./build/$(BUILD)</set> + + + <option name="WXDCINCLUDE"> + <description>Additional path to find wxDevCenter include directory.</description> + <values>../wxDevCenter/include</values> + </option> + <option name="WXDCLIB"> + <description>Additional path to find wxDevCenter include directory.</description> + <values>../wxDevCenter/bin</values> + </option> + <option name="EXPORTBIN"> + <description>Additional path prefix to export plugins.</description> + <values>../wxDevCenter, .</values> + <default-value>.</default-value> + </option> + + <dll id="Text" template="wxDLL"> <libname>StdPlugin.Text$(SUFFIX)</libname> ! <dirname>$(EXPORTBIN)/plugins/StdPlugin.Text</dirname> ! <include>$(WXDCINCLUDE)</include> <include>include</include> <sources> src/Controls.cpp *************** *** 21,25 **** <wxlib-gui>adv</wxlib-gui> <wxlib-gui>stc</wxlib-gui> ! <sys-lib>wxDevCenter$(SUFFIX)</sys-lib> <install-to>$(LIBDIR)/wxDevCenter/plugins/StdPlugin.Text</install-to> --- 36,41 ---- <wxlib-gui>adv</wxlib-gui> <wxlib-gui>stc</wxlib-gui> ! <lib-path>$(WXDCLIB)</lib-path> ! <sys-lib>wxDevCenterLib</sys-lib> <install-to>$(LIBDIR)/wxDevCenter/plugins/StdPlugin.Text</install-to> *************** *** 28,34 **** <dll id="Bitmap" template="wxDLL"> <libname>StdPlugin.Bitmap$(SUFFIX)</libname> ! <include>include</include> - <include>$(PATHTOWXDC)/include</include> <sources> src/BitmapCtrl.cpp --- 44,50 ---- <dll id="Bitmap" template="wxDLL"> <libname>StdPlugin.Bitmap$(SUFFIX)</libname> ! <dirname>$(EXPORTBIN)/plugins/StdPlugin.Bitmap</dirname> ! <include>$(WXDCINCLUDE)</include> <include>include</include> <sources> src/BitmapCtrl.cpp *************** *** 41,45 **** <wxlib-gui>core</wxlib-gui> <wxlib-gui>adv</wxlib-gui> ! <sys-lib>wxDevCenter$(SUFFIX)</sys-lib> <install-to>$(LIBDIR)/wxDevCenter/plugins/StdPlugin.Bitmap</install-to> --- 57,62 ---- <wxlib-gui>core</wxlib-gui> <wxlib-gui>adv</wxlib-gui> ! <lib-path>$(WXDCLIB)</lib-path> ! <sys-lib>wxDevCenterLib</sys-lib> <install-to>$(LIBDIR)/wxDevCenter/plugins/StdPlugin.Bitmap</install-to> |