Menu
▾
▴
[Wxlua-commit] wxLua/apps Makefile.in,1.49,1.50
|
From: Francesco M. <fr...@us...> - 2006-12-22 20:45:39
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28891/apps Modified Files: Makefile.in Log Message: added Mac-bundling support (mostly a copy and paste of wxWidgets' mac bundling support code) Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** Makefile.in 22 Dec 2006 18:57:01 -0000 1.49 --- Makefile.in 22 Dec 2006 20:45:05 -0000 1.50 *************** *** 35,38 **** --- 35,39 ---- WX_LIBS = @WX_LIBS@ WX_RESCOMP = @WX_RESCOMP@ + WX_VERSION = @WX_VERSION@ WX_PORT = @WX_PORT@ WX_VERSION_MAJOR = @WX_VERSION_MAJOR@ *************** *** 113,116 **** --- 114,118 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ = \ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ uninstall_app_wxlua + @COND_PLATFORM_MACOSX_1@__app_wxlua_bundle___depname = app_wxlua_bundle @COND_PLATFORM_WIN32_1@__app_wxlua___win32rc = app_wxlua_wxlua_rc.o @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@__app_wxluaedit___depname \ *************** *** 130,133 **** --- 132,137 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@__uninstall_app_wxluaedit___depname \ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ = uninstall_app_wxluaedit + @COND_PLATFORM_MACOSX_1@__app_wxluaedit_bundle___depname \ + @COND_PLATFORM_MACOSX_1@ = app_wxluaedit_bundle @COND_PLATFORM_WIN32_1@__app_wxluaedit___win32rc = \ @COND_PLATFORM_WIN32_1@ app_wxluaedit_wxluaedit_rc.o *************** *** 148,151 **** --- 152,157 ---- @COND_USE_WXLUACANAPP_1@__uninstall_app_wxluacan___depname \ @COND_USE_WXLUACANAPP_1@ = uninstall_app_wxluacan + @COND_PLATFORM_MACOSX_1@__app_wxluacan_bundle___depname \ + @COND_PLATFORM_MACOSX_1@ = app_wxluacan_bundle @COND_PLATFORM_WIN32_1@__app_wxluacan___win32rc = app_wxluacan_cansim_rc.o @COND_USE_WXLUAFREEZEAPP_1@__app_wxluafreeze___depname \ *************** *** 165,168 **** --- 171,176 ---- @COND_USE_WXLUAFREEZEAPP_1@__uninstall_app_wxluafreeze___depname \ @COND_USE_WXLUAFREEZEAPP_1@ = uninstall_app_wxluafreeze + @COND_PLATFORM_MACOSX_1@__app_wxluafreeze_bundle___depname \ + @COND_PLATFORM_MACOSX_1@ = app_wxluafreeze_bundle @COND_PLATFORM_WIN32_1@__app_wxluafreeze___win32rc = \ @COND_PLATFORM_WIN32_1@ app_wxluafreeze_wxluafreeze_rc.o *************** *** 170,174 **** ### Targets: ### ! all: $(top_builddir)/bin/lua$(EXEEXT) $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) install: all install_app_lua $(__install_app_wxlua___depname) $(__install_app_wxluaedit___depname) $(__install_app_wxluacan___depname) $(__install_app_wxluafreeze___depname) --- 178,182 ---- ### Targets: ### ! all: $(top_builddir)/bin/lua$(EXEEXT) $(__app_wxlua___depname) $(__app_wxlua_bundle___depname) $(__app_wxluaedit___depname) $(__app_wxluaedit_bundle___depname) $(__app_wxluacan___depname) $(__app_wxluacan_bundle___depname) $(__app_wxluafreeze___depname) $(__app_wxluafreeze_bundle___depname) install: all install_app_lua $(__install_app_wxlua___depname) $(__install_app_wxluaedit___depname) $(__install_app_wxluacan___depname) $(__install_app_wxluafreeze___depname) *************** *** 188,194 **** --- 196,206 ---- rm -f $(top_builddir)/bin/lua$(EXEEXT) rm -f $(top_builddir)/bin/wxlua$(EXEEXT) + rm -rf app_wxlua.app rm -f $(top_builddir)/bin/wxluaedit$(EXEEXT) + rm -rf app_wxluaedit.app rm -f $(top_builddir)/bin/wxluacan$(EXEEXT) + rm -rf app_wxluacan.app rm -f $(top_builddir)/bin/wxluafreeze$(EXEEXT) + rm -rf app_wxluafreeze.app distclean: clean *************** *** 220,223 **** --- 232,257 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ rm -f $(DESTDIR)$(bindir)/wxlua$(EXEEXT) + app_wxlua.app/Contents/PkgInfo: $(__app_wxlua___depname) $(top_srcdir)/distrib/macbundle/Info.plist.in $(top_srcdir)/distrib/macbundle/Info.plist.in/wxLua.icns + mkdir -p app_wxlua.app/Contents + mkdir -p app_wxlua.app/Contents/MacOS + mkdir -p app_wxlua.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/app_wxlua/" \ + -e "s/VERSION/$(WX_VERSION)/" \ + $(top_srcdir)/distrib/macbundle/Info.plist.in >app_wxlua.app/Contents/Info.plist + + + echo -n "APPL????" >app_wxlua.app/Contents/PkgInfo + + + ln -f $(top_builddir)/bin/wxlua$(EXEEXT) app_wxlua.app/Contents/MacOS/app_wxlua + + + cp -f $(top_srcdir)/distrib/macbundle/Info.plist.in/wxLua.icns app_wxlua.app/Contents/Resources/wxLua.icns + + @COND_PLATFORM_MACOSX_1@app_wxlua_bundle: app_wxlua.app/Contents/PkgInfo + @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@$(top_builddir)/bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 -lwx_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_stedit-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) *************** *** 233,236 **** --- 267,292 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluaedit$(EXEEXT) + app_wxluaedit.app/Contents/PkgInfo: $(__app_wxluaedit___depname) $(top_srcdir)/distrib/macbundle/Info.plist.in $(top_srcdir)/distrib/macbundle/Info.plist.in/wxLua.icns + mkdir -p app_wxluaedit.app/Contents + mkdir -p app_wxluaedit.app/Contents/MacOS + mkdir -p app_wxluaedit.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/app_wxluaedit/" \ + -e "s/VERSION/$(WX_VERSION)/" \ + $(top_srcdir)/distrib/macbundle/Info.plist.in >app_wxluaedit.app/Contents/Info.plist + + + echo -n "APPL????" >app_wxluaedit.app/Contents/PkgInfo + + + ln -f $(top_builddir)/bin/wxluaedit$(EXEEXT) app_wxluaedit.app/Contents/MacOS/app_wxluaedit + + + cp -f $(top_srcdir)/distrib/macbundle/Info.plist.in/wxLua.icns app_wxluaedit.app/Contents/Resources/wxLua.icns + + @COND_PLATFORM_MACOSX_1@app_wxluaedit_bundle: app_wxluaedit.app/Contents/PkgInfo + @COND_USE_WXLUACANAPP_1@$(top_builddir)/bin/wxluacan$(EXEEXT): $(APP_WXLUACAN_OBJECTS) $(__app_wxluacan___win32rc) @COND_USE_WXLUACANAPP_1@ $(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) *************** *** 246,249 **** --- 302,327 ---- @COND_USE_WXLUACANAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluacan$(EXEEXT) + app_wxluacan.app/Contents/PkgInfo: $(__app_wxluacan___depname) $(top_srcdir)/distrib/macbundle/Info.plist.in $(top_srcdir)/distrib/macbundle/Info.plist.in/wxLua.icns + mkdir -p app_wxluacan.app/Contents + mkdir -p app_wxluacan.app/Contents/MacOS + mkdir -p app_wxluacan.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/app_wxluacan/" \ + -e "s/VERSION/$(WX_VERSION)/" \ + $(top_srcdir)/distrib/macbundle/Info.plist.in >app_wxluacan.app/Contents/Info.plist + + + echo -n "APPL????" >app_wxluacan.app/Contents/PkgInfo + + + ln -f $(top_builddir)/bin/wxluacan$(EXEEXT) app_wxluacan.app/Contents/MacOS/app_wxluacan + + + cp -f $(top_srcdir)/distrib/macbundle/Info.plist.in/wxLua.icns app_wxluacan.app/Contents/Resources/wxLua.icns + + @COND_PLATFORM_MACOSX_1@app_wxluacan_bundle: app_wxluacan.app/Contents/PkgInfo + @COND_USE_WXLUAFREEZEAPP_1@$(top_builddir)/bin/wxluafreeze$(EXEEXT): $(APP_WXLUAFREEZE_OBJECTS) $(__app_wxluafreeze___win32rc) @COND_USE_WXLUAFREEZEAPP_1@ $(CXX) -o $@ $(APP_WXLUAFREEZE_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) *************** *** 259,262 **** --- 337,362 ---- @COND_USE_WXLUAFREEZEAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluafreeze$(EXEEXT) + app_wxluafreeze.app/Contents/PkgInfo: $(__app_wxluafreeze___depname) $(top_srcdir)/distrib/macbundle/Info.plist.in $(top_srcdir)/distrib/macbundle/Info.plist.in/wxLua.icns + mkdir -p app_wxluafreeze.app/Contents + mkdir -p app_wxluafreeze.app/Contents/MacOS + mkdir -p app_wxluafreeze.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/app_wxluafreeze/" \ + -e "s/VERSION/$(WX_VERSION)/" \ + $(top_srcdir)/distrib/macbundle/Info.plist.in >app_wxluafreeze.app/Contents/Info.plist + + + echo -n "APPL????" >app_wxluafreeze.app/Contents/PkgInfo + + + ln -f $(top_builddir)/bin/wxluafreeze$(EXEEXT) app_wxluafreeze.app/Contents/MacOS/app_wxluafreeze + + + cp -f $(top_srcdir)/distrib/macbundle/Info.plist.in/wxLua.icns app_wxluafreeze.app/Contents/Resources/wxLua.icns + + @COND_PLATFORM_MACOSX_1@app_wxluafreeze_bundle: app_wxluafreeze.app/Contents/PkgInfo + app_lua_lua.o: $(srcdir)/../modules/lua/src/lua.c $(CCC) -c -o $@ $(APP_LUA_CFLAGS) $(srcdir)/../modules/lua/src/lua.c *************** *** 308,310 **** @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_app_lua uninstall_app_lua install_app_wxlua uninstall_app_wxlua install_app_wxluaedit uninstall_app_wxluaedit install_app_wxluacan uninstall_app_wxluacan install_app_wxluafreeze uninstall_app_wxluafreeze --- 408,410 ---- @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_app_lua uninstall_app_lua install_app_wxlua uninstall_app_wxlua app_wxlua_bundle install_app_wxluaedit uninstall_app_wxluaedit app_wxluaedit_bundle install_app_wxluacan uninstall_app_wxluacan app_wxluacan_bundle install_app_wxluafreeze uninstall_app_wxluafreeze app_wxluafreeze_bundle |
