X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd9f42b6a94f9d68c66cf363093442b12cd4e953..f284605f65f6f957c90452b574f4131079819b53:/contrib/samples/ogl/studio/Makefile.in

diff --git a/contrib/samples/ogl/studio/Makefile.in b/contrib/samples/ogl/studio/Makefile.in
index 78d78291de..0ff8f53d54 100644
--- a/contrib/samples/ogl/studio/Makefile.in
+++ b/contrib/samples/ogl/studio/Makefile.in
@@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 SETFILE = @SETFILE@
 TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
 TOOLKIT = @TOOLKIT@
@@ -33,22 +34,22 @@ top_srcdir = @top_srcdir@
 ### Variables: ###
 
 LIBDIRNAME = $(top_builddir)lib
-OGLEDIT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-	-I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
-	$(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../include $(CXXFLAGS)
-OGLEDIT_OBJECTS =  \
-	ogledit_studio.o \
-	ogledit_doc.o \
-	ogledit_shapes.o \
-	ogledit_symbols.o \
-	ogledit_view.o \
-	ogledit_cspalette.o \
-	ogledit_mainfrm.o \
-	ogledit_project.o \
-	ogledit_dialogs.o \
-	ogledit_csprint.o \
-	$(__ogledit___win32rc)
+STUDIO_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	-I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
+	-I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CXXFLAGS)
+STUDIO_OBJECTS =  \
+	studio_studio.o \
+	studio_doc.o \
+	studio_shapes.o \
+	studio_symbols.o \
+	studio_view.o \
+	studio_cspalette.o \
+	studio_mainfrm.o \
+	studio_project.o \
+	studio_dialogs.o \
+	studio_csprint.o \
+	$(__studio___win32rc)
+WX_VERSION = 2.5.0
 
 ### Conditionally set variables: ###
 
@@ -64,34 +65,6 @@ OGLEDIT_OBJECTS =  \
 @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
-@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p = -I$(top_srcdir)/src/expat/lib
-@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p_1 = -i $(top_srcdir)/src/expat/lib
-@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p_2 = \
-@COND_WXUSE_EXPAT_BUILTIN@	--include-dir $(top_srcdir)/src/expat/lib
-@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg
-@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg
-@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \
-@COND_WXUSE_LIBJPEG_BUILTIN@	--include-dir $(top_srcdir)/src/jpeg
-@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc
-@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc
-@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \
-@COND_WXUSE_ODBC_BUILTIN@	--include-dir $(top_srcdir)/src/odbc
-@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png
-@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png
-@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \
-@COND_WXUSE_LIBPNG_BUILTIN@	--include-dir $(top_srcdir)/src/png
-@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex
-@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex
-@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \
-@COND_WXUSE_REGEX_BUILTIN@	--include-dir $(top_srcdir)/src/regex
-@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff
-@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff
-@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \
-@COND_WXUSE_LIBTIFF_BUILTIN@	--include-dir $(top_srcdir)/src/tiff
-@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib
-@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib
-@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \
-@COND_WXUSE_ZLIB_BUILTIN@	--include-dir $(top_srcdir)/src/zlib
 @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
 @COND_WXUSE_EXPAT_BUILTIN@	-lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)
 @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
@@ -110,12 +83,14 @@ OGLEDIT_OBJECTS =  \
 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
 @COND_WXUSE_ZLIB_BUILTIN@	-lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
-	__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
-	$(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
-	$(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \
-	$(__DLLFLAG_p_1) -i $(srcdir)/../../../include -o ogledit$(EXEEXT) Carbon.r \
-	$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../../samples/sample.r
+	__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \
+	$(__DLLFLAG_p_1) -i $(srcdir)/../../../../samples -i \
+	$(srcdir)/../../../include -o studio$(EXEEXT) Carbon.r \
+	$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
+COND_MONOLITHIC_0___WXLIB_ADV_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
@@ -127,19 +102,21 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
-@COND_PLATFORM_MAC_1@__ogledit___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
-@COND_PLATFORM_MAC_1@__ogledit___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@	$(SETFILE) -a C ogledit$(EXEEXT)
-@COND_PLATFORM_WIN32_1@__ogledit___win32rc = ogledit_studio_rc.o
+@COND_PLATFORM_MAC_1@__studio___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
+@COND_PLATFORM_MAC_1@__studio___mac_setfilecmd = \
+@COND_PLATFORM_MAC_1@	$(SETFILE) -a C studio$(EXEEXT)
+@COND_PLATFORM_WIN32_1@__studio___win32rc = studio_studio_rc.o
+@COND_PLATFORM_MACOSX_1@__studio_bundle___depname = studio_bundle
 
 ### Targets: ###
 
-all: ogledit$(EXEEXT) data
+all: studio$(EXEEXT) $(__studio_bundle___depname) data
 
 clean: 
-	rm -rf ./.deps
+	rm -rf ./.deps ./.pch
 	rm -f ./*.o
-	rm -f ogledit$(EXEEXT)
+	rm -f studio$(EXEEXT)
+	rm -rf studio.app
 
 data: 
 	@mkdir -p .
@@ -150,50 +127,73 @@ data:
 	done
 
 distclean: clean
-	rm -f configure config.cache config.log config.status
-	rm -f bk-deps shared-ld-sh
+	rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 install: all
 
 install-strip: install
 
-ogledit$(EXEEXT): $(OGLEDIT_OBJECTS) $(__ogledit___win32rc)
-	$(CXX) -o $@ $(OGLEDIT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_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)
-	$(__ogledit___mac_rezcmd)
-	$(__ogledit___mac_setfilecmd)
+studio$(EXEEXT): $(STUDIO_OBJECTS) $(__studio___win32rc)
+	$(CXX) -o $@ $(STUDIO_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX) $(__WXLIB_ADV_p) $(__WXLIB_CORE_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)
+	$(__studio___mac_rezcmd)
+	$(__studio___mac_setfilecmd)
+	$(SAMPLES_RPATH_POSTLINK)
 
-ogledit_cspalette.o: $(srcdir)/cspalette.cpp
-	$(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
+studio.app/Contents: studio$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+	mkdir -p studio.app/Contents
+	mkdir -p studio.app/Contents/MacOS
+	mkdir -p studio.app/Contents/Resources
+	
+	
+	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+	-e "s/EXECUTABLE/studio/" \
+	-e "s/VERSION/$(WX_VERSION)/" \
+	$(top_srcdir)/src/mac/Info.plist.in >studio.app/Contents/Info.plist
+	
+	
+	echo -n "APPL????" >studio.app/Contents/PkgInfo
+	
+	
+	ln -f studio$(EXEEXT) studio.app/Contents/MacOS/studio
+	
+	
+	ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc studio.app/Contents/Resources/studio.rsrc
+	ln -f $(top_srcdir)/src/mac/wxmac.icns studio.app/Contents/Resources/wxmac.icns
 
-ogledit_csprint.o: $(srcdir)/csprint.cpp
-	$(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
+@COND_PLATFORM_MACOSX_1@studio_bundle: studio.app/Contents
 
-ogledit_dialogs.o: $(srcdir)/dialogs.cpp
-	$(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
+studio_cspalette.o: $(srcdir)/cspalette.cpp
+	$(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
 
-ogledit_doc.o: $(srcdir)/doc.cpp
-	$(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
+studio_csprint.o: $(srcdir)/csprint.cpp
+	$(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
 
-ogledit_mainfrm.o: $(srcdir)/mainfrm.cpp
-	$(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
+studio_dialogs.o: $(srcdir)/dialogs.cpp
+	$(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
 
-ogledit_project.o: $(srcdir)/project.cpp
-	$(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
+studio_doc.o: $(srcdir)/doc.cpp
+	$(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
 
-ogledit_shapes.o: $(srcdir)/shapes.cpp
-	$(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
+studio_mainfrm.o: $(srcdir)/mainfrm.cpp
+	$(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
 
-ogledit_studio.o: $(srcdir)/studio.cpp
-	$(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
+studio_project.o: $(srcdir)/project.cpp
+	$(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
 
-ogledit_studio_rc.o: $(srcdir)/studio.rc
-	$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../include
+studio_shapes.o: $(srcdir)/shapes.cpp
+	$(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
 
-ogledit_symbols.o: $(srcdir)/symbols.cpp
-	$(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
+studio_studio.o: $(srcdir)/studio.cpp
+	$(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
 
-ogledit_view.o: $(srcdir)/view.cpp
-	$(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
+studio_studio_rc.o: $(srcdir)/studio.rc
+	$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples --include-dir $(srcdir)/../../../include
+
+studio_symbols.o: $(srcdir)/symbols.cpp
+	$(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
+
+studio_view.o: $(srcdir)/view.cpp
+	$(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<
 
 uninstall: 
 
@@ -201,4 +201,4 @@ uninstall:
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 
-.PHONY: all clean data distclean install uninstall
+.PHONY: all clean data distclean install studio_bundle uninstall