Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1493/wxLua/apps/build/bakefiles
Modified Files:
apps.bkl options.bkl
Log Message:
reorder libs in apps.bkl and rebake, (remove -- in bkl, got error)
pulled in generic code in wxLuaInterface into the wxLuaState
Index: options.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/options.bkl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** options.bkl 26 Nov 2005 14:06:05 -0000 1.3
--- options.bkl 29 Nov 2005 23:52:11 -0000 1.4
***************
*** 17,21 ****
<!-- module enable/disable option defaults
NOTE: if you change these defaults, then you should also change the
! defaults for the --enable-* options in configure script:
see wxLua/build/autoconf/configure.ac
-->
--- 17,21 ----
<!-- module enable/disable option defaults
NOTE: if you change these defaults, then you should also change the
! defaults for the -enable-* options in configure script:
see wxLua/build/autoconf/configure.ac
-->
Index: apps.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** apps.bkl 26 Nov 2005 14:06:05 -0000 1.10
--- apps.bkl 29 Nov 2005 23:52:11 -0000 1.11
***************
*** 65,85 ****
<win32-res>wxlua/src/wxlua.rc</win32-res>
! <!-- 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>wxbind</wxlua-lib>
<wxlua-lib>lua</wxlua-lib>
! <wx-lib>adv</wx-lib>
! <wx-lib>base</wx-lib>
! <wx-lib>core</wx-lib>
<wx-lib>html</wx-lib>
<wx-lib>media</wx-lib>
<wx-lib>net</wx-lib>
<wx-lib>xml</wx-lib>
! <wx-lib>xrc</wx-lib>
- <wx-lib>stc</wx-lib>
</exe>
--- 65,86 ----
<win32-res>wxlua/src/wxlua.rc</win32-res>
! <!-- Libraries must be put in the reverse order they'll be loaded -->
<wxlua-lib>wxluasocket</wxlua-lib>
! <wxlua-lib>wxluadebug</wxlua-lib>
<wxlua-lib>wxbind</wxlua-lib>
+ <wxlua-lib>wxlua</wxlua-lib>
<wxlua-lib>lua</wxlua-lib>
! <wx-lib>stc</wx-lib>
!
! <wx-lib>xrc</wx-lib>
<wx-lib>html</wx-lib>
<wx-lib>media</wx-lib>
+ <wx-lib>adv</wx-lib>
<wx-lib>net</wx-lib>
<wx-lib>xml</wx-lib>
! <wx-lib>core</wx-lib>
! <wx-lib>base</wx-lib>
</exe>
***************
*** 104,127 ****
</if>
! <!-- 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>wxbind</wxlua-lib>
<wxlua-lib>lua</wxlua-lib>
! <wx-lib>adv</wx-lib>
! <wx-lib>base</wx-lib>
! <wx-lib>core</wx-lib>
<wx-lib>html</wx-lib>
<wx-lib>media</wx-lib>
<wx-lib>net</wx-lib>
<wx-lib>xml</wx-lib>
! <wx-lib>xrc</wx-lib>
!
! <wx-lib>stc</wx-lib>
!
! <!-- Library for wxstedit -->
! <wx-lib>stedit</wx-lib>
</exe>
--- 105,128 ----
</if>
! <!-- Libraries must be put in the reverse order they'll be loaded -->
<wxlua-lib>wxluasocket</wxlua-lib>
! <wxlua-lib>wxluadebug</wxlua-lib>
<wxlua-lib>wxbind</wxlua-lib>
+ <wxlua-lib>wxlua</wxlua-lib>
<wxlua-lib>lua</wxlua-lib>
! <wx-lib>stedit</wx-lib> <!-- Library for wxCode's wxstedit -->
!
! <wx-lib>stc</wx-lib>
!
! <wx-lib>xrc</wx-lib>
<wx-lib>html</wx-lib>
<wx-lib>media</wx-lib>
+ <wx-lib>adv</wx-lib>
<wx-lib>net</wx-lib>
<wx-lib>xml</wx-lib>
! <wx-lib>core</wx-lib>
! <wx-lib>base</wx-lib>
!
</exe>
|
