Update of /cvsroot/wxlua/wxLua/apps
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1493/wxLua/apps
Modified Files:
Makefile.in
Log Message:
reorder libs in apps.bkl and rebake, (remove -- in bkl, got error)
pulled in generic code in wxLuaInterface into the wxLuaState
Index: Makefile.in
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Makefile.in 25 Nov 2005 23:06:10 -0000 1.10
--- Makefile.in 29 Nov 2005 23:52:11 -0000 1.11
***************
*** 80,84 ****
@COND_USE_WXLUAAPP_1@../bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc)
! @COND_USE_WXLUAAPP_1@ $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L../lib $(LDFLAGS_GUI) $(WX_LIBS) -lwxluadebug -lwxluasocket -lwxlua -lwxbind -llua
@COND_USE_WXLUAAPP_1@
@COND_USE_WXLUAAPP_1@ $(__app_wxlua___mac_setfilecmd)
--- 80,84 ----
@COND_USE_WXLUAAPP_1@../bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc)
! @COND_USE_WXLUAAPP_1@ $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L../lib $(LDFLAGS_GUI) -lwxluasocket -lwxluadebug -lwxbind -lwxlua -llua $(WX_LIBS)
@COND_USE_WXLUAAPP_1@
@COND_USE_WXLUAAPP_1@ $(__app_wxlua___mac_setfilecmd)
***************
*** 86,90 ****
@COND_USE_WXLUAEDITAPP_1@../bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc)
! @COND_USE_WXLUAEDITAPP_1@ $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L../lib $(LDFLAGS_GUI) $(WX_LIBS) -lwxluadebug -lwxluasocket -lwxlua -lwxbind -llua
@COND_USE_WXLUAEDITAPP_1@
@COND_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_setfilecmd)
--- 86,90 ----
@COND_USE_WXLUAEDITAPP_1@../bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc)
! @COND_USE_WXLUAEDITAPP_1@ $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L../lib $(LDFLAGS_GUI) -lwxluasocket -lwxluadebug -lwxbind -lwxlua -llua $(WX_LIBS)
@COND_USE_WXLUAEDITAPP_1@
@COND_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_setfilecmd)
|
