Update to bakefile 0.2.11 and rebake everything
The main/only change in this version is the removal of automatic rules using old Carbon Rez/DeRez/SetFile tools.
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.2.9 (http://www.bakefile.org)
|
||||
# Bakefile 0.2.11 (http://www.bakefile.org)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
@@ -13,7 +13,6 @@ datarootdir = @datarootdir@
|
||||
INSTALL = @INSTALL@
|
||||
EXEEXT = @EXEEXT@
|
||||
WINDRES = @WINDRES@
|
||||
SETFILE = @SETFILE@
|
||||
NM = @NM@
|
||||
BK_DEPS = @BK_DEPS@
|
||||
srcdir = @srcdir@
|
||||
@@ -87,9 +86,6 @@ BASESERVER_OBJECTS = \
|
||||
@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
|
||||
@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
|
||||
@COND_USE_GUI_1@__client___depname = client$(EXEEXT)
|
||||
@COND_PLATFORM_MAC_0@__client___mac_setfilecmd = @true
|
||||
@COND_PLATFORM_MAC_1@__client___mac_setfilecmd = \
|
||||
@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL client$(EXEEXT)
|
||||
COND_PLATFORM_OS2_1___client___os2_emxbindcmd = $(NM) client$(EXEEXT) | if grep \
|
||||
-q pmwin.763 ; then emxbind -ep client$(EXEEXT) ; fi
|
||||
@COND_PLATFORM_OS2_1@__client___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___client___os2_emxbindcmd)
|
||||
@@ -108,9 +104,6 @@ COND_PLATFORM_OS2_1___client___os2_emxbindcmd = $(NM) client$(EXEEXT) | if grep
|
||||
@COND_TOOLKIT_OSX_IPHONE@____client_BUNDLE_TGT_REF_DEP \
|
||||
@COND_TOOLKIT_OSX_IPHONE@ = $(__client_app_Contents_PkgInfo___depname)
|
||||
@COND_USE_GUI_1@__server___depname = server$(EXEEXT)
|
||||
@COND_PLATFORM_MAC_0@__server___mac_setfilecmd = @true
|
||||
@COND_PLATFORM_MAC_1@__server___mac_setfilecmd = \
|
||||
@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL server$(EXEEXT)
|
||||
COND_PLATFORM_OS2_1___server___os2_emxbindcmd = $(NM) server$(EXEEXT) | if grep \
|
||||
-q pmwin.763 ; then emxbind -ep server$(EXEEXT) ; fi
|
||||
@COND_PLATFORM_OS2_1@__server___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___server___os2_emxbindcmd)
|
||||
@@ -128,13 +121,7 @@ COND_PLATFORM_OS2_1___server___os2_emxbindcmd = $(NM) server$(EXEEXT) | if grep
|
||||
@COND_TOOLKIT_OSX_COCOA@ = $(__server_app_Contents_PkgInfo___depname)
|
||||
@COND_TOOLKIT_OSX_IPHONE@____server_BUNDLE_TGT_REF_DEP \
|
||||
@COND_TOOLKIT_OSX_IPHONE@ = $(__server_app_Contents_PkgInfo___depname)
|
||||
@COND_PLATFORM_MAC_0@__baseclient___mac_setfilecmd = @true
|
||||
@COND_PLATFORM_MAC_1@__baseclient___mac_setfilecmd = \
|
||||
@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL baseclient$(EXEEXT)
|
||||
@COND_MONOLITHIC_1@__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
|
||||
@COND_PLATFORM_MAC_0@__baseserver___mac_setfilecmd = @true
|
||||
@COND_PLATFORM_MAC_1@__baseserver___mac_setfilecmd = \
|
||||
@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL baseserver$(EXEEXT)
|
||||
@COND_MONOLITHIC_1@__LIB_PNG_IF_MONO_p_1 = $(__LIB_PNG_p)
|
||||
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_0 = --define __WXUNIVERSAL__
|
||||
@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_0 = --define wxDEBUG_LEVEL=0
|
||||
@@ -207,8 +194,6 @@ distclean: clean
|
||||
|
||||
@COND_USE_GUI_1@client$(EXEEXT): $(CLIENT_OBJECTS) $(__client___win32rc)
|
||||
@COND_USE_GUI_1@ $(CXX) -o $@ $(CLIENT_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
|
||||
@COND_USE_GUI_1@
|
||||
@COND_USE_GUI_1@ $(__client___mac_setfilecmd)
|
||||
@COND_USE_GUI_1@ $(__client___os2_emxbindcmd)
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_USE_GUI_1@client.app/Contents/PkgInfo: $(__client___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
|
||||
@@ -235,8 +220,6 @@ distclean: clean
|
||||
|
||||
@COND_USE_GUI_1@server$(EXEEXT): $(SERVER_OBJECTS) $(__server___win32rc)
|
||||
@COND_USE_GUI_1@ $(CXX) -o $@ $(SERVER_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
|
||||
@COND_USE_GUI_1@
|
||||
@COND_USE_GUI_1@ $(__server___mac_setfilecmd)
|
||||
@COND_USE_GUI_1@ $(__server___os2_emxbindcmd)
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_USE_GUI_1@server.app/Contents/PkgInfo: $(__server___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
|
||||
@@ -263,13 +246,9 @@ distclean: clean
|
||||
|
||||
baseclient$(EXEEXT): $(BASECLIENT_OBJECTS)
|
||||
$(CXX) -o $@ $(BASECLIENT_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
|
||||
|
||||
$(__baseclient___mac_setfilecmd)
|
||||
|
||||
baseserver$(EXEEXT): $(BASESERVER_OBJECTS)
|
||||
$(CXX) -o $@ $(BASESERVER_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p_1) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
|
||||
|
||||
$(__baseserver___mac_setfilecmd)
|
||||
|
||||
client_sample_rc.o: $(srcdir)/../../samples/sample.rc
|
||||
$(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
|
||||
|
@@ -1,6 +1,6 @@
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.2.9 (http://www.bakefile.org)
|
||||
# Bakefile 0.2.11 (http://www.bakefile.org)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
|
@@ -1,6 +1,6 @@
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.2.9 (http://www.bakefile.org)
|
||||
# Bakefile 0.2.11 (http://www.bakefile.org)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
|
@@ -1,6 +1,6 @@
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.2.9 (http://www.bakefile.org)
|
||||
# Bakefile 0.2.11 (http://www.bakefile.org)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
|
@@ -1,6 +1,6 @@
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.2.9 (http://www.bakefile.org)
|
||||
# Bakefile 0.2.11 (http://www.bakefile.org)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
|
@@ -2,7 +2,7 @@
|
||||
<!--
|
||||
|
||||
This project was generated by
|
||||
Bakefile 0.2.9 (http://www.bakefile.org)
|
||||
Bakefile 0.2.11 (http://www.bakefile.org)
|
||||
Do not modify, all changes will be overwritten!
|
||||
|
||||
-->
|
||||
|
@@ -2,7 +2,7 @@
|
||||
<!--
|
||||
|
||||
This project was generated by
|
||||
Bakefile 0.2.9 (http://www.bakefile.org)
|
||||
Bakefile 0.2.11 (http://www.bakefile.org)
|
||||
Do not modify, all changes will be overwritten!
|
||||
|
||||
-->
|
||||
|
@@ -2,7 +2,7 @@
|
||||
<!--
|
||||
|
||||
This project was generated by
|
||||
Bakefile 0.2.9 (http://www.bakefile.org)
|
||||
Bakefile 0.2.11 (http://www.bakefile.org)
|
||||
Do not modify, all changes will be overwritten!
|
||||
|
||||
-->
|
||||
|
@@ -2,7 +2,7 @@
|
||||
<!--
|
||||
|
||||
This project was generated by
|
||||
Bakefile 0.2.9 (http://www.bakefile.org)
|
||||
Bakefile 0.2.11 (http://www.bakefile.org)
|
||||
Do not modify, all changes will be overwritten!
|
||||
|
||||
-->
|
||||
|
@@ -2,7 +2,7 @@
|
||||
<!--
|
||||
|
||||
This project was generated by
|
||||
Bakefile 0.2.9 (http://www.bakefile.org)
|
||||
Bakefile 0.2.11 (http://www.bakefile.org)
|
||||
Do not modify, all changes will be overwritten!
|
||||
|
||||
-->
|
||||
|
@@ -2,7 +2,7 @@
|
||||
<!--
|
||||
|
||||
This project was generated by
|
||||
Bakefile 0.2.9 (http://www.bakefile.org)
|
||||
Bakefile 0.2.11 (http://www.bakefile.org)
|
||||
Do not modify, all changes will be overwritten!
|
||||
|
||||
-->
|
||||
|
@@ -2,7 +2,7 @@
|
||||
<!--
|
||||
|
||||
This project was generated by
|
||||
Bakefile 0.2.9 (http://www.bakefile.org)
|
||||
Bakefile 0.2.11 (http://www.bakefile.org)
|
||||
Do not modify, all changes will be overwritten!
|
||||
|
||||
-->
|
||||
|
@@ -2,7 +2,7 @@
|
||||
<!--
|
||||
|
||||
This project was generated by
|
||||
Bakefile 0.2.9 (http://www.bakefile.org)
|
||||
Bakefile 0.2.11 (http://www.bakefile.org)
|
||||
Do not modify, all changes will be overwritten!
|
||||
|
||||
-->
|
||||
|
@@ -2,7 +2,7 @@
|
||||
<!--
|
||||
|
||||
This project was generated by
|
||||
Bakefile 0.2.9 (http://www.bakefile.org)
|
||||
Bakefile 0.2.11 (http://www.bakefile.org)
|
||||
Do not modify, all changes will be overwritten!
|
||||
|
||||
-->
|
||||
|
@@ -2,7 +2,7 @@
|
||||
<!--
|
||||
|
||||
This project was generated by
|
||||
Bakefile 0.2.9 (http://www.bakefile.org)
|
||||
Bakefile 0.2.11 (http://www.bakefile.org)
|
||||
Do not modify, all changes will be overwritten!
|
||||
|
||||
-->
|
||||
|
@@ -2,7 +2,7 @@
|
||||
<!--
|
||||
|
||||
This project was generated by
|
||||
Bakefile 0.2.9 (http://www.bakefile.org)
|
||||
Bakefile 0.2.11 (http://www.bakefile.org)
|
||||
Do not modify, all changes will be overwritten!
|
||||
|
||||
-->
|
||||
|
@@ -2,7 +2,7 @@
|
||||
<!--
|
||||
|
||||
This project was generated by
|
||||
Bakefile 0.2.9 (http://www.bakefile.org)
|
||||
Bakefile 0.2.11 (http://www.bakefile.org)
|
||||
Do not modify, all changes will be overwritten!
|
||||
|
||||
-->
|
||||
|
Reference in New Issue
Block a user