From: John L. <jr...@us...> - 2008-01-09 05:47:29
|
Update of /cvsroot/wxlua/wxLua/build In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1663/wxLua/build Modified Files: Makefile_wx-config.in Makefile_wx-config_targets.in Log Message: Add simple check for Lua's Makefile to work in Linux and OSX Index: Makefile_wx-config.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/Makefile_wx-config.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile_wx-config.in 22 Jul 2007 04:38:28 -0000 1.3 --- Makefile_wx-config.in 9 Jan 2008 05:47:26 -0000 1.4 *************** *** 37,40 **** --- 37,49 ---- endif + # Lua PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris + + LUA_PLAT=linux + + ifeq (Apple, $(findstring Apple, $(shell gcc --version))) + LUA_PLAT=macosx + endif + + # --- wxWidgets parameters from wx-config ------------------------------------ Index: Makefile_wx-config_targets.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/Makefile_wx-config_targets.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile_wx-config_targets.in 16 Jul 2007 19:34:28 -0000 1.2 --- Makefile_wx-config_targets.in 9 Jan 2008 05:47:26 -0000 1.3 *************** *** 11,15 **** Lua: ! @(cd $(WXLUA_DIR)/modules/lua && make linux) wxLuaLib: --- 11,15 ---- Lua: ! @(cd $(WXLUA_DIR)/modules/lua && make $(LUA_PLAT)) wxLuaLib: |