Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3140/apps/build/bakefiles
Modified Files:
apps.bkl
Log Message:
Fixed modules compilation
Index: apps.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** apps.bkl 12 Jun 2005 21:21:10 -0000 1.1
--- apps.bkl 14 Jun 2005 21:44:39 -0000 1.2
***************
*** 16,23 ****
--- 16,25 ----
<!-- Win32 makefiles will be put in BUILD/MSW -->
<set var="WXLUA_BASEDIR">..$(DIRSEP)..$(DIRSEP)..</set>
+ <set var="WXLUA_APPSDIR">..$(DIRSEP)..</set>
</if>
<if cond="TARGETING_WIN32=='0'">
<!-- Unix makefiles will be put in the main folder -->
<set var="WXLUA_BASEDIR">..</set>
+ <set var="WXLUA_APPSDIR">.</set>
</if>
***************
*** 30,34 ****
<!-- all the sources listed into sources.bkl contain path relative to our wxLua\app dir -->
! <set var="SRCDIR">$(WXLUA_BASEDIR)</set>
<include file="sources.bkl"/>
--- 32,36 ----
<!-- all the sources listed into sources.bkl contain path relative to our wxLua\app dir -->
! <set var="SRCDIR">$(WXLUA_APPSDIR)</set>
<include file="sources.bkl"/>
***************
*** 38,52 ****
<!-- The WXLUA application target -->
<!-- -->
<exe id="wxlua" template="wxlua">
<sources>$(WXLUA_SRC)</sources>
<headers>$(WXLUA_HDR)</headers>
<dirname>$(WXLUA_BASEDIR)$(DIRSEP)bin</dirname>
<!-- Libraries must be put in the right order ! -->
<wx-lib>adv</wx-lib>
<wx-lib>xml</wx-lib>
<wx-lib>core</wx-lib>
! <wx-lib>base</wx-lib>
</exe>
--- 40,71 ----
<!-- The WXLUA application target -->
<!-- -->
+
+ <action id="wrap">
+ <dependency-of>all</dependency-of>
+ <depends-on-file>..\..\..\bindings\wxwidgets\override.hpp</depends-on-file>
+ <command>..\..\..\bin\lua -e"target=\"msw\"" ..\..\wxlua\src\wrap.lua</command>
+ <command>copy ..\..\..\bindings\wxwidgets\wxluawrap.i ..\..\..\bindings\wxwidgets\wxluawrap.c</command>
+ </action>
<exe id="wxlua" template="wxlua">
+ <depends>wrap</depends>
<sources>$(WXLUA_SRC)</sources>
<headers>$(WXLUA_HDR)</headers>
<dirname>$(WXLUA_BASEDIR)$(DIRSEP)bin</dirname>
+ <win32-res>wxlua/src/wxlua.rc</win32-res>
+
+ <!-- here we handle the -->
+ <sources>..\bindings\wxwidgets\wxluawrap.c</sources>
+
<!-- Libraries must be put in the right order ! -->
+ <wxlua-lib>wxluadebug</wxlua-lib>
+ <wxlua-lib>wxluasocket</wxlua-lib>
+ <wxlua-lib>wxlua</wxlua-lib>
+ <wxlua-lib>lua</wxlua-lib>
<wx-lib>adv</wx-lib>
<wx-lib>xml</wx-lib>
<wx-lib>core</wx-lib>
! <wx-lib>base</wx-lib>
</exe>
|
