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 @@ BASEIPCSERVER_OBJECTS = \
|
||||
@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
|
||||
@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
|
||||
@COND_USE_GUI_1@__ipcclient___depname = ipcclient$(EXEEXT)
|
||||
@COND_PLATFORM_MAC_0@__ipcclient___mac_setfilecmd = @true
|
||||
@COND_PLATFORM_MAC_1@__ipcclient___mac_setfilecmd = \
|
||||
@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL ipcclient$(EXEEXT)
|
||||
COND_PLATFORM_OS2_1___ipcclient___os2_emxbindcmd = $(NM) ipcclient$(EXEEXT) | \
|
||||
if grep -q pmwin.763 ; then emxbind -ep ipcclient$(EXEEXT) ; fi
|
||||
@COND_PLATFORM_OS2_1@__ipcclient___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___ipcclient___os2_emxbindcmd)
|
||||
@@ -109,9 +105,6 @@ COND_PLATFORM_OS2_1___ipcclient___os2_emxbindcmd = $(NM) ipcclient$(EXEEXT) | \
|
||||
@COND_TOOLKIT_OSX_IPHONE@____ipcclient_BUNDLE_TGT_REF_DEP \
|
||||
@COND_TOOLKIT_OSX_IPHONE@ = $(__ipcclient_app_Contents_PkgInfo___depname)
|
||||
@COND_USE_GUI_1@__ipcserver___depname = ipcserver$(EXEEXT)
|
||||
@COND_PLATFORM_MAC_0@__ipcserver___mac_setfilecmd = @true
|
||||
@COND_PLATFORM_MAC_1@__ipcserver___mac_setfilecmd = \
|
||||
@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL ipcserver$(EXEEXT)
|
||||
COND_PLATFORM_OS2_1___ipcserver___os2_emxbindcmd = $(NM) ipcserver$(EXEEXT) | \
|
||||
if grep -q pmwin.763 ; then emxbind -ep ipcserver$(EXEEXT) ; fi
|
||||
@COND_PLATFORM_OS2_1@__ipcserver___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___ipcserver___os2_emxbindcmd)
|
||||
@@ -130,13 +123,7 @@ COND_PLATFORM_OS2_1___ipcserver___os2_emxbindcmd = $(NM) ipcserver$(EXEEXT) | \
|
||||
@COND_TOOLKIT_OSX_COCOA@ = $(__ipcserver_app_Contents_PkgInfo___depname)
|
||||
@COND_TOOLKIT_OSX_IPHONE@____ipcserver_BUNDLE_TGT_REF_DEP \
|
||||
@COND_TOOLKIT_OSX_IPHONE@ = $(__ipcserver_app_Contents_PkgInfo___depname)
|
||||
@COND_PLATFORM_MAC_0@__baseipcclient___mac_setfilecmd = @true
|
||||
@COND_PLATFORM_MAC_1@__baseipcclient___mac_setfilecmd \
|
||||
@COND_PLATFORM_MAC_1@ = $(SETFILE) -t APPL baseipcclient$(EXEEXT)
|
||||
@COND_MONOLITHIC_1@__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
|
||||
@COND_PLATFORM_MAC_0@__baseipcserver___mac_setfilecmd = @true
|
||||
@COND_PLATFORM_MAC_1@__baseipcserver___mac_setfilecmd \
|
||||
@COND_PLATFORM_MAC_1@ = $(SETFILE) -t APPL baseipcserver$(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
|
||||
@@ -209,8 +196,6 @@ distclean: clean
|
||||
|
||||
@COND_USE_GUI_1@ipcclient$(EXEEXT): $(IPCCLIENT_OBJECTS) $(__ipcclient___win32rc)
|
||||
@COND_USE_GUI_1@ $(CXX) -o $@ $(IPCCLIENT_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@ $(__ipcclient___mac_setfilecmd)
|
||||
@COND_USE_GUI_1@ $(__ipcclient___os2_emxbindcmd)
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_USE_GUI_1@ipcclient.app/Contents/PkgInfo: $(__ipcclient___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
|
||||
@@ -237,8 +222,6 @@ distclean: clean
|
||||
|
||||
@COND_USE_GUI_1@ipcserver$(EXEEXT): $(IPCSERVER_OBJECTS) $(__ipcserver___win32rc)
|
||||
@COND_USE_GUI_1@ $(CXX) -o $@ $(IPCSERVER_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@ $(__ipcserver___mac_setfilecmd)
|
||||
@COND_USE_GUI_1@ $(__ipcserver___os2_emxbindcmd)
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_USE_GUI_1@ipcserver.app/Contents/PkgInfo: $(__ipcserver___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
|
||||
@@ -265,13 +248,9 @@ distclean: clean
|
||||
|
||||
baseipcclient$(EXEEXT): $(BASEIPCCLIENT_OBJECTS)
|
||||
$(CXX) -o $@ $(BASEIPCCLIENT_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)
|
||||
|
||||
$(__baseipcclient___mac_setfilecmd)
|
||||
|
||||
baseipcserver$(EXEEXT): $(BASEIPCSERVER_OBJECTS)
|
||||
$(CXX) -o $@ $(BASEIPCSERVER_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)
|
||||
|
||||
$(__baseipcserver___mac_setfilecmd)
|
||||
|
||||
ipcclient_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
|
||||
|
@@ -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!
|
||||
|
||||
-->
|
||||
|
@@ -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!
|
||||
# =========================================================================
|
||||
|
||||
|
Reference in New Issue
Block a user