X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b14abf14c7b6a29e907035ff24a86d45be762752..58c23da1d54bf50d9f892b692b941f2cd20d96d0:/samples/ipc/Makefile.in

diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in
index 3e92503f5a..e6caafeade 100644
--- a/samples/ipc/Makefile.in
+++ b/samples/ipc/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.6 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -11,7 +11,8 @@ prefix = @prefix@
 exec_prefix = @exec_prefix@
 INSTALL = @INSTALL@
 EXEEXT = @EXEEXT@
-RESCOMP = @RESCOMP@
+WINDRES = @WINDRES@
+REZ = @REZ@
 SETFILE = @SETFILE@
 NM = @NM@
 srcdir = @srcdir@
@@ -26,7 +27,7 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
 TOOLKIT = @TOOLKIT@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
-TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
+TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
@@ -36,17 +37,19 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 ### Variables: ###
 
 DESTDIR = 
-WX_RELEASE = 2.5
-WX_VERSION = $(WX_RELEASE).4
+WX_RELEASE = 2.7
+WX_VERSION = $(WX_RELEASE).0
 LIBDIRNAME = $(top_builddir)lib
-CLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
-	$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
+CLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 CLIENT_OBJECTS =  \
 	$(__client___win32rc) \
 	$(os2_lib_res) \
 	client_client.o
-SERVER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
-	$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
+SERVER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 SERVER_OBJECTS =  \
 	$(__server___win32rc) \
 	$(os2_lib_res) \
@@ -91,22 +94,37 @@ COND_PLATFORM_OS2_1___server___os2_emxbindcmd = $(NM) server$(EXEEXT) | if grep
 @COND_TOOLKIT_COCOA@	server.app/Contents/PkgInfo
 @COND_TOOLKIT_MAC@____server_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_MAC@	server.app/Contents/PkgInfo
-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).4.r sample.r
+COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2 = $(REZ) -d __DARWIN__ -t APPL -d \
+	__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) \
+	$(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) -i $(srcdir) $(__DLLFLAG_p_0) -i \
+	$(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \
+	client$(EXEEXT) Carbon.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).4.r sample.r
+COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3 = $(REZ) -d __DARWIN__ -t APPL -d \
+	__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) \
+	$(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) -i $(srcdir) $(__DLLFLAG_p_0) -i \
+	$(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \
+	server$(EXEEXT) Carbon.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__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_6 = --define __WXUNIVERSAL__
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_0 = -d wxNO_EXCEPTIONS
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_6 = --define wxNO_EXCEPTIONS
+@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
+@COND_USE_RTTI_0@__RTTI_DEFINE_p_0 = -d wxNO_RTTI
+@COND_USE_RTTI_0@__RTTI_DEFINE_p_6 = --define wxNO_RTTI
+@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
+@COND_USE_THREADS_0@__THREAD_DEFINE_p_0 = -d wxNO_THREADS
+@COND_USE_THREADS_0@__THREAD_DEFINE_p_6 = --define wxNO_THREADS
 @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_0 = -d WXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_6 = --define WXUSINGDLL
+@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \
+@COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_TOOLKIT_MSW@__RCDEFDIR_p_0 = --include-dir \
+@COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@os2_lib_res = $(top_srcdir)/include/wx/os2/wx.res
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
@@ -167,7 +185,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).4.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+client.app/Contents/PkgInfo: client$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
 	mkdir -p client.app/Contents
 	mkdir -p client.app/Contents/MacOS
 	mkdir -p client.app/Contents/Resources
@@ -185,7 +203,6 @@ client.app/Contents/PkgInfo: client$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
 	ln -f client$(EXEEXT) client.app/Contents/MacOS/client
 	
 	
-	cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.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_BUNDLE_TGT_REF_DEP)
@@ -197,7 +214,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).4.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+server.app/Contents/PkgInfo: server$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
 	mkdir -p server.app/Contents
 	mkdir -p server.app/Contents/MacOS
 	mkdir -p server.app/Contents/Resources
@@ -215,19 +232,18 @@ server.app/Contents/PkgInfo: server$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
 	ln -f server$(EXEEXT) server.app/Contents/MacOS/server
 	
 	
-	cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.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_BUNDLE_TGT_REF_DEP)
 
 client_sample_rc.o: $(srcdir)/../../samples/sample.rc
-	$(RESCOMP) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6)   --include-dir $(srcdir) $(__DLLFLAG_p_6) --include-dir $(srcdir)/../../samples --include-dir $(top_srcdir)/include
+	$(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6)  $(__EXCEPTIONS_DEFINE_p_6) $(__RTTI_DEFINE_p_6) $(__THREAD_DEFINE_p_6)   --include-dir $(srcdir) $(__DLLFLAG_p_6) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_0) --include-dir $(top_srcdir)/include
 
 client_client.o: $(srcdir)/client.cpp
 	$(CXXC) -c -o $@ $(CLIENT_CXXFLAGS) $(srcdir)/client.cpp
 
 server_sample_rc.o: $(srcdir)/../../samples/sample.rc
-	$(RESCOMP) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6)   --include-dir $(srcdir) $(__DLLFLAG_p_6) --include-dir $(srcdir)/../../samples --include-dir $(top_srcdir)/include
+	$(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6)  $(__EXCEPTIONS_DEFINE_p_6) $(__RTTI_DEFINE_p_6) $(__THREAD_DEFINE_p_6)   --include-dir $(srcdir) $(__DLLFLAG_p_6) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_0) --include-dir $(top_srcdir)/include
 
 server_server.o: $(srcdir)/server.cpp
 	$(CXXC) -c -o $@ $(SERVER_CXXFLAGS) $(srcdir)/server.cpp