X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0b0efa9a672287c89dc19c345ecf840f15c484c6..302e251b4df575dc60eb5bfafc931652dad165ec:/samples/sockets/Makefile.in diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in index dfe6152211..f2ee481a80 100644 --- a/samples/sockets/Makefile.in +++ b/samples/sockets/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.3 (http://bakefile.sourceforge.net) +# Bakefile 0.1.4 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -35,7 +35,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ ### Variables: ### DESTDIR = -WX_VERSION = 2.5.1 +WX_VERSION = 2.5.2 LIBDIRNAME = $(top_builddir)lib CLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) @@ -68,6 +68,10 @@ 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) @COND_PLATFORM_MACOSX_1@__client_bundle___depname = client_bundle +@COND_TOOLKIT_COCOA@____client_BUNDLE_TGT_REF_DEP = \ +@COND_TOOLKIT_COCOA@ client.app/Contents/PkgInfo +@COND_TOOLKIT_MAC@____client_BUNDLE_TGT_REF_DEP = \ +@COND_TOOLKIT_MAC@ client.app/Contents/PkgInfo @COND_PLATFORM_WIN32_1@__client___win32rc = client_client_rc.o @COND_PLATFORM_MAC_1@__server___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C server$(EXEEXT) @@ -76,16 +80,20 @@ 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) @COND_PLATFORM_MACOSX_1@__server_bundle___depname = server_bundle +@COND_TOOLKIT_COCOA@____server_BUNDLE_TGT_REF_DEP = \ +@COND_TOOLKIT_COCOA@ server.app/Contents/PkgInfo +@COND_TOOLKIT_MAC@____server_BUNDLE_TGT_REF_DEP = \ +@COND_TOOLKIT_MAC@ server.app/Contents/PkgInfo @COND_PLATFORM_WIN32_1@__server___win32rc = server_server_rc.o COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) -i $(srcdir) $(__DLLFLAG_p_0) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o client$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_2 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) -i $(srcdir) $(__DLLFLAG_p_0) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o server$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_3 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_0 = -d __WXUNIVERSAL__ @@ -150,7 +158,7 @@ client$(EXEEXT): $(CLIENT_OBJECTS) $(__client___win32rc) $(__client___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -client.app/Contents/PkgInfo: client$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +client.app/Contents/PkgInfo: client$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p client.app/Contents mkdir -p client.app/Contents/MacOS mkdir -p client.app/Contents/Resources @@ -168,10 +176,10 @@ client.app/Contents/PkgInfo: client$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p ln -f client$(EXEEXT) client.app/Contents/MacOS/client - ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc client.app/Contents/Resources/client.rsrc - ln -sf $(top_srcdir)/src/mac/wxmac.icns client.app/Contents/Resources/wxmac.icns + cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc client.app/Contents/Resources/client.rsrc + cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns client.app/Contents/Resources/wxmac.icns -@COND_PLATFORM_MACOSX_1@client_bundle: client.app/Contents/PkgInfo +@COND_PLATFORM_MACOSX_1@client_bundle: $(____client_BUNDLE_TGT_REF_DEP) server$(EXEEXT): $(SERVER_OBJECTS) $(__server___win32rc) $(CXX) -o $@ $(SERVER_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) @@ -180,7 +188,7 @@ server$(EXEEXT): $(SERVER_OBJECTS) $(__server___win32rc) $(__server___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -server.app/Contents/PkgInfo: server$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +server.app/Contents/PkgInfo: server$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p server.app/Contents mkdir -p server.app/Contents/MacOS mkdir -p server.app/Contents/Resources @@ -198,10 +206,10 @@ server.app/Contents/PkgInfo: server$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p ln -f server$(EXEEXT) server.app/Contents/MacOS/server - ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc server.app/Contents/Resources/server.rsrc - ln -sf $(top_srcdir)/src/mac/wxmac.icns server.app/Contents/Resources/wxmac.icns + cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc server.app/Contents/Resources/server.rsrc + cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns server.app/Contents/Resources/wxmac.icns -@COND_PLATFORM_MACOSX_1@server_bundle: server.app/Contents/PkgInfo +@COND_PLATFORM_MACOSX_1@server_bundle: $(____server_BUNDLE_TGT_REF_DEP) client_client.o: $(srcdir)/client.cpp $(CXXC) -c -o $@ $(CLIENT_CXXFLAGS) $<