X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab892b9519be1eb18beb27928c767203809dce12..854e7dc33264b7d85174bc0efdb4bc023a12e179:/contrib/samples/fl/Makefile.in diff --git a/contrib/samples/fl/Makefile.in b/contrib/samples/fl/Makefile.in index e1976de4de..4439664d70 100644 --- a/contrib/samples/fl/Makefile.in +++ b/contrib/samples/fl/Makefile.in @@ -19,6 +19,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ +NM = @NM@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ @@ -34,46 +35,42 @@ top_srcdir = @top_srcdir@ ### Variables: ### FL_DEMO1_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)/../../../samples \ - -I$(srcdir)/../../include -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) + -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ + -I$(srcdir)/../../../samples -I$(srcdir)/../../include \ + -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) FL_DEMO1_OBJECTS = \ fl_demo1_fl_demo1.o \ $(__fl_demo1___win32rc) FL_DEMO2_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)/../../../samples \ - -I$(srcdir)/../../include -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) + -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ + -I$(srcdir)/../../../samples -I$(srcdir)/../../include \ + -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) FL_DEMO2_OBJECTS = \ fl_demo2_fl_demo2.o \ $(__fl_demo2___win32rc) FL_SAMPLE1_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)/../../../samples \ - -I$(srcdir)/../../include -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) + -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ + -I$(srcdir)/../../../samples -I$(srcdir)/../../include \ + -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) FL_SAMPLE1_OBJECTS = \ fl_sample1_fl_sample1.o \ $(__fl_sample1___win32rc) FL_SAMPLE2_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)/../../../samples \ - -I$(srcdir)/../../include -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) + -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ + -I$(srcdir)/../../../samples -I$(srcdir)/../../include \ + -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) FL_SAMPLE2_OBJECTS = \ fl_sample2_fl_sample2.o \ $(__fl_sample2___win32rc) FL_SAMPLE3_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)/../../../samples \ - -I$(srcdir)/../../include -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) + -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ + -I$(srcdir)/../../../samples -I$(srcdir)/../../include \ + -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) FL_SAMPLE3_OBJECTS = \ fl_sample3_fl_sample3.o \ $(__fl_sample3___win32rc) LIBDIRNAME = $(top_builddir)lib +WX_VERSION = 2.5.1 ### Conditionally set variables: ### @@ -88,35 +85,7 @@ LIBDIRNAME = $(top_builddir)lib @COND_WXUNIV_1@WXUNIVNAME = univ @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_18 = --define WXUSINGDLL -@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p = -I$(top_srcdir)/src/expat/lib -@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p_19 = \ -@COND_WXUSE_EXPAT_BUILTIN@ --include-dir $(top_srcdir)/src/expat/lib -@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p_20 = -i $(top_srcdir)/src/expat/lib -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_18 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1_1 = \ -@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_2 = \ -@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1_3 = -i $(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_18 = \ -@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_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1_3 = \ -@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_1_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_2 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1_3 = \ -@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_SHARED_1@__DLLFLAG_p_17 = --define WXUSINGDLL @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 \ @@ -135,44 +104,34 @@ LIBDIRNAME = $(top_builddir)lib @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_5 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ - $(__INC_TIFF_p_1) $(__INC_JPEG_p_18) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1_2) \ - $(__INC_ODBC_p_1_3) $(__INC_REGEX_p_1_1) $(__INC_EXPAT_p_20) -i $(srcdir) \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -d \ - BMP_DIR="bitmaps/" -o fl_demo2$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + BMP_DIR="bitmaps/" -o fl_sample3$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_5 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_5) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_6 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ - $(__INC_TIFF_p_1) $(__INC_JPEG_p_18) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1_2) \ - $(__INC_ODBC_p_1_3) $(__INC_REGEX_p_1_1) $(__INC_EXPAT_p_20) -i $(srcdir) \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -d \ - BMP_DIR="bitmaps/" -o fl_sample3$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + BMP_DIR="bitmaps/" -o fl_sample2$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_6 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_6) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_7 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ - $(__INC_TIFF_p_1) $(__INC_JPEG_p_18) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1_2) \ - $(__INC_ODBC_p_1_3) $(__INC_REGEX_p_1_1) $(__INC_EXPAT_p_20) -i $(srcdir) \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -d \ - BMP_DIR="bitmaps/" -o fl_sample2$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + BMP_DIR="bitmaps/" -o fl_sample1$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_7 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_7) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_8 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ - $(__INC_TIFF_p_1) $(__INC_JPEG_p_18) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1_2) \ - $(__INC_ODBC_p_1_3) $(__INC_REGEX_p_1_1) $(__INC_EXPAT_p_20) -i $(srcdir) \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -d \ - BMP_DIR="bitmaps/" -o fl_sample1$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + BMP_DIR="bitmaps/" -o fl_demo1$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_8 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_8) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_9 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ - $(__INC_TIFF_p_1) $(__INC_JPEG_p_18) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1_2) \ - $(__INC_ODBC_p_1_3) $(__INC_REGEX_p_1_1) $(__INC_EXPAT_p_20) -i $(srcdir) \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -d \ - BMP_DIR="bitmaps/" -o fl_demo1$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + BMP_DIR="bitmaps/" -o fl_demo2$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_9 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_9) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -184,36 +143,51 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(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_22 = --define __WXUNIVERSAL__ -@COND_PLATFORM_MAC_1@__fl_demo1___mac_rezcmd = $(__MACOSX_RESOURCES_p_9) +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1_1 = --define __WXUNIVERSAL__ +@COND_PLATFORM_MAC_1@__fl_demo1___mac_rezcmd = $(__MACOSX_RESOURCES_p_8) @COND_PLATFORM_MAC_1@__fl_demo1___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C fl_demo1$(EXEEXT) +COND_PLATFORM_OS2_1___fl_demo1___os2_emxbindcmd = $(NM) fl_demo1$(EXEEXT) | if \ + grep -q pmwin.763 ; then emxbind -ep fl_demo1$(EXEEXT) ; fi +@COND_PLATFORM_OS2_1@__fl_demo1___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___fl_demo1___os2_emxbindcmd) @COND_PLATFORM_WIN32_1@__fl_demo1___win32rc = fl_demo1_fl_demo1_rc.o @COND_PLATFORM_MACOSX_1@__fl_demo1_bundle___depname = fl_demo1_bundle -@COND_PLATFORM_MAC_1@__fl_demo2___mac_rezcmd = $(__MACOSX_RESOURCES_p_5) +@COND_PLATFORM_MAC_1@__fl_demo2___mac_rezcmd = $(__MACOSX_RESOURCES_p_9) @COND_PLATFORM_MAC_1@__fl_demo2___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C fl_demo2$(EXEEXT) +COND_PLATFORM_OS2_1___fl_demo2___os2_emxbindcmd = $(NM) fl_demo2$(EXEEXT) | if \ + grep -q pmwin.763 ; then emxbind -ep fl_demo2$(EXEEXT) ; fi +@COND_PLATFORM_OS2_1@__fl_demo2___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___fl_demo2___os2_emxbindcmd) @COND_PLATFORM_WIN32_1@__fl_demo2___win32rc = fl_demo2_fl_demo2_rc.o @COND_PLATFORM_MACOSX_1@__fl_demo2_bundle___depname = fl_demo2_bundle -@COND_PLATFORM_MAC_1@__fl_sample1___mac_rezcmd = $(__MACOSX_RESOURCES_p_8) +@COND_PLATFORM_MAC_1@__fl_sample1___mac_rezcmd = $(__MACOSX_RESOURCES_p_7) @COND_PLATFORM_MAC_1@__fl_sample1___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C fl_sample1$(EXEEXT) +COND_PLATFORM_OS2_1___fl_sample1___os2_emxbindcmd = $(NM) fl_sample1$(EXEEXT) \ + | if grep -q pmwin.763 ; then emxbind -ep fl_sample1$(EXEEXT) ; fi +@COND_PLATFORM_OS2_1@__fl_sample1___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___fl_sample1___os2_emxbindcmd) @COND_PLATFORM_WIN32_1@__fl_sample1___win32rc = fl_sample1_fl_sample1_rc.o @COND_PLATFORM_MACOSX_1@__fl_sample1_bundle___depname = fl_sample1_bundle -@COND_PLATFORM_MAC_1@__fl_sample2___mac_rezcmd = $(__MACOSX_RESOURCES_p_7) +@COND_PLATFORM_MAC_1@__fl_sample2___mac_rezcmd = $(__MACOSX_RESOURCES_p_6) @COND_PLATFORM_MAC_1@__fl_sample2___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C fl_sample2$(EXEEXT) +COND_PLATFORM_OS2_1___fl_sample2___os2_emxbindcmd = $(NM) fl_sample2$(EXEEXT) \ + | if grep -q pmwin.763 ; then emxbind -ep fl_sample2$(EXEEXT) ; fi +@COND_PLATFORM_OS2_1@__fl_sample2___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___fl_sample2___os2_emxbindcmd) @COND_PLATFORM_WIN32_1@__fl_sample2___win32rc = fl_sample2_fl_sample2_rc.o @COND_PLATFORM_MACOSX_1@__fl_sample2_bundle___depname = fl_sample2_bundle -@COND_PLATFORM_MAC_1@__fl_sample3___mac_rezcmd = $(__MACOSX_RESOURCES_p_6) +@COND_PLATFORM_MAC_1@__fl_sample3___mac_rezcmd = $(__MACOSX_RESOURCES_p_5) @COND_PLATFORM_MAC_1@__fl_sample3___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C fl_sample3$(EXEEXT) +COND_PLATFORM_OS2_1___fl_sample3___os2_emxbindcmd = $(NM) fl_sample3$(EXEEXT) \ + | if grep -q pmwin.763 ; then emxbind -ep fl_sample3$(EXEEXT) ; fi +@COND_PLATFORM_OS2_1@__fl_sample3___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___fl_sample3___os2_emxbindcmd) @COND_PLATFORM_WIN32_1@__fl_sample3___win32rc = fl_sample3_fl_sample3_rc.o @COND_PLATFORM_MACOSX_1@__fl_sample3_bundle___depname = fl_sample3_bundle ### Targets: ### -all: fl_demo1$(EXEEXT) $(__fl_demo1_bundle___depname) fl_demo2$(EXEEXT) $(__fl_demo2_bundle___depname) fl_sample1$(EXEEXT) $(__fl_sample1_bundle___depname) fl_sample2$(EXEEXT) $(__fl_sample2_bundle___depname) fl_sample3$(EXEEXT) $(__fl_sample3_bundle___depname) +all: fl_demo1$(EXEEXT) $(__fl_demo1_bundle___depname) fl_demo2$(EXEEXT) $(__fl_demo2_bundle___depname) fl_sample1$(EXEEXT) $(__fl_sample1_bundle___depname) fl_sample2$(EXEEXT) $(__fl_sample2_bundle___depname) fl_sample3$(EXEEXT) $(__fl_sample3_bundle___depname) data_files clean: rm -rf ./.deps ./.pch @@ -229,16 +203,25 @@ clean: rm -f fl_sample3$(EXEEXT) rm -rf fl_sample3.app +data_files: + @mkdir -p ./bitmaps + @for f in bookmarks.bmp class_icon.bmp class_icon1.bmp copy.bmp cut.bmp file_icon.bmp folder_icon.bmp help_icon.bmp new.bmp nextmark.bmp open.bmp paste.bmp prevmark.bmp res_icon.bmp save.bmp saveall.bmp search.bmp start95_dp.bmp start95_pr.bmp tile.bmp; do \ + if test \( ! -s ./bitmaps/$$f \) -o \( $(srcdir)/bitmaps/$$f -nt ./bitmaps/$$f \) ; then \ + cp -pRf $(srcdir)/bitmaps/$$f ./bitmaps ; \ + fi; \ + done + distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile fl_demo1$(EXEEXT): $(FL_DEMO1_OBJECTS) $(__fl_demo1___win32rc) - $(CXX) -o $@ $(FL_DEMO1_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-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) + $(CXX) -o $@ $(FL_DEMO1_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-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) $(__fl_demo1___mac_rezcmd) $(__fl_demo1___mac_setfilecmd) + $(__fl_demo1___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -fl_demo1.app/Contents: fl_demo1$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +fl_demo1.app/Contents/PkgInfo: fl_demo1$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p fl_demo1.app/Contents mkdir -p fl_demo1.app/Contents/MacOS mkdir -p fl_demo1.app/Contents/Resources @@ -246,7 +229,7 @@ fl_demo1.app/Contents: fl_demo1$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/fl_demo1/" \ - -e "s/VERSION/2.5.0/" \ + -e "s/VERSION/$(WX_VERSION)/" \ $(top_srcdir)/src/mac/Info.plist.in >fl_demo1.app/Contents/Info.plist @@ -256,24 +239,25 @@ fl_demo1.app/Contents: fl_demo1$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L ln -f fl_demo1$(EXEEXT) fl_demo1.app/Contents/MacOS/fl_demo1 - ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc fl_demo1.app/Contents/Resources/fl_demo1.rsrc + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc fl_demo1.app/Contents/Resources/fl_demo1.rsrc ln -f $(top_srcdir)/src/mac/wxmac.icns fl_demo1.app/Contents/Resources/wxmac.icns -@COND_PLATFORM_MACOSX_1@fl_demo1_bundle: fl_demo1.app/Contents +@COND_PLATFORM_MACOSX_1@fl_demo1_bundle: fl_demo1.app/Contents/PkgInfo fl_demo1_fl_demo1.o: $(srcdir)/fl_demo1.cpp $(CXXC) -c -o $@ $(FL_DEMO1_CXXFLAGS) $< fl_demo1_fl_demo1_rc.o: $(srcdir)/fl_demo1.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_22) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_1_2) $(__INC_JPEG_p_1_1) $(__INC_PNG_p_18) $(__INC_ZLIB_p_1_3) $(__INC_ODBC_p_1_2) $(__INC_REGEX_p_1_3) $(__INC_EXPAT_p_19) --include-dir $(srcdir) $(__DLLFLAG_p_18) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/" + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_1) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_17) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/" fl_demo2$(EXEEXT): $(FL_DEMO2_OBJECTS) $(__fl_demo2___win32rc) - $(CXX) -o $@ $(FL_DEMO2_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-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) + $(CXX) -o $@ $(FL_DEMO2_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-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) $(__fl_demo2___mac_rezcmd) $(__fl_demo2___mac_setfilecmd) + $(__fl_demo2___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -fl_demo2.app/Contents: fl_demo2$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +fl_demo2.app/Contents/PkgInfo: fl_demo2$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p fl_demo2.app/Contents mkdir -p fl_demo2.app/Contents/MacOS mkdir -p fl_demo2.app/Contents/Resources @@ -281,7 +265,7 @@ fl_demo2.app/Contents: fl_demo2$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/fl_demo2/" \ - -e "s/VERSION/2.5.0/" \ + -e "s/VERSION/$(WX_VERSION)/" \ $(top_srcdir)/src/mac/Info.plist.in >fl_demo2.app/Contents/Info.plist @@ -291,24 +275,25 @@ fl_demo2.app/Contents: fl_demo2$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L ln -f fl_demo2$(EXEEXT) fl_demo2.app/Contents/MacOS/fl_demo2 - ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc fl_demo2.app/Contents/Resources/fl_demo2.rsrc + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc fl_demo2.app/Contents/Resources/fl_demo2.rsrc ln -f $(top_srcdir)/src/mac/wxmac.icns fl_demo2.app/Contents/Resources/wxmac.icns -@COND_PLATFORM_MACOSX_1@fl_demo2_bundle: fl_demo2.app/Contents +@COND_PLATFORM_MACOSX_1@fl_demo2_bundle: fl_demo2.app/Contents/PkgInfo fl_demo2_fl_demo2.o: $(srcdir)/fl_demo2.cpp $(CXXC) -c -o $@ $(FL_DEMO2_CXXFLAGS) $< fl_demo2_fl_demo2_rc.o: $(srcdir)/fl_demo2.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_22) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_1_2) $(__INC_JPEG_p_1_1) $(__INC_PNG_p_18) $(__INC_ZLIB_p_1_3) $(__INC_ODBC_p_1_2) $(__INC_REGEX_p_1_3) $(__INC_EXPAT_p_19) --include-dir $(srcdir) $(__DLLFLAG_p_18) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/" + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_1) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_17) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/" fl_sample1$(EXEEXT): $(FL_SAMPLE1_OBJECTS) $(__fl_sample1___win32rc) - $(CXX) -o $@ $(FL_SAMPLE1_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-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) + $(CXX) -o $@ $(FL_SAMPLE1_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-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) $(__fl_sample1___mac_rezcmd) $(__fl_sample1___mac_setfilecmd) + $(__fl_sample1___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -fl_sample1.app/Contents: fl_sample1$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +fl_sample1.app/Contents/PkgInfo: fl_sample1$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p fl_sample1.app/Contents mkdir -p fl_sample1.app/Contents/MacOS mkdir -p fl_sample1.app/Contents/Resources @@ -316,7 +301,7 @@ fl_sample1.app/Contents: fl_sample1$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/fl_sample1/" \ - -e "s/VERSION/2.5.0/" \ + -e "s/VERSION/$(WX_VERSION)/" \ $(top_srcdir)/src/mac/Info.plist.in >fl_sample1.app/Contents/Info.plist @@ -326,24 +311,25 @@ fl_sample1.app/Contents: fl_sample1$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in ln -f fl_sample1$(EXEEXT) fl_sample1.app/Contents/MacOS/fl_sample1 - ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc fl_sample1.app/Contents/Resources/fl_sample1.rsrc + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc fl_sample1.app/Contents/Resources/fl_sample1.rsrc ln -f $(top_srcdir)/src/mac/wxmac.icns fl_sample1.app/Contents/Resources/wxmac.icns -@COND_PLATFORM_MACOSX_1@fl_sample1_bundle: fl_sample1.app/Contents +@COND_PLATFORM_MACOSX_1@fl_sample1_bundle: fl_sample1.app/Contents/PkgInfo fl_sample1_fl_sample1.o: $(srcdir)/fl_sample1.cpp $(CXXC) -c -o $@ $(FL_SAMPLE1_CXXFLAGS) $< fl_sample1_fl_sample1_rc.o: $(srcdir)/fl_sample1.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_22) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_1_2) $(__INC_JPEG_p_1_1) $(__INC_PNG_p_18) $(__INC_ZLIB_p_1_3) $(__INC_ODBC_p_1_2) $(__INC_REGEX_p_1_3) $(__INC_EXPAT_p_19) --include-dir $(srcdir) $(__DLLFLAG_p_18) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/" + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_1) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_17) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/" fl_sample2$(EXEEXT): $(FL_SAMPLE2_OBJECTS) $(__fl_sample2___win32rc) - $(CXX) -o $@ $(FL_SAMPLE2_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-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) + $(CXX) -o $@ $(FL_SAMPLE2_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-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) $(__fl_sample2___mac_rezcmd) $(__fl_sample2___mac_setfilecmd) + $(__fl_sample2___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -fl_sample2.app/Contents: fl_sample2$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +fl_sample2.app/Contents/PkgInfo: fl_sample2$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p fl_sample2.app/Contents mkdir -p fl_sample2.app/Contents/MacOS mkdir -p fl_sample2.app/Contents/Resources @@ -351,7 +337,7 @@ fl_sample2.app/Contents: fl_sample2$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/fl_sample2/" \ - -e "s/VERSION/2.5.0/" \ + -e "s/VERSION/$(WX_VERSION)/" \ $(top_srcdir)/src/mac/Info.plist.in >fl_sample2.app/Contents/Info.plist @@ -361,24 +347,25 @@ fl_sample2.app/Contents: fl_sample2$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in ln -f fl_sample2$(EXEEXT) fl_sample2.app/Contents/MacOS/fl_sample2 - ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc fl_sample2.app/Contents/Resources/fl_sample2.rsrc + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc fl_sample2.app/Contents/Resources/fl_sample2.rsrc ln -f $(top_srcdir)/src/mac/wxmac.icns fl_sample2.app/Contents/Resources/wxmac.icns -@COND_PLATFORM_MACOSX_1@fl_sample2_bundle: fl_sample2.app/Contents +@COND_PLATFORM_MACOSX_1@fl_sample2_bundle: fl_sample2.app/Contents/PkgInfo fl_sample2_fl_sample2.o: $(srcdir)/fl_sample2.cpp $(CXXC) -c -o $@ $(FL_SAMPLE2_CXXFLAGS) $< fl_sample2_fl_sample2_rc.o: $(srcdir)/fl_sample2.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_22) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_1_2) $(__INC_JPEG_p_1_1) $(__INC_PNG_p_18) $(__INC_ZLIB_p_1_3) $(__INC_ODBC_p_1_2) $(__INC_REGEX_p_1_3) $(__INC_EXPAT_p_19) --include-dir $(srcdir) $(__DLLFLAG_p_18) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/" + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_1) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_17) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/" fl_sample3$(EXEEXT): $(FL_SAMPLE3_OBJECTS) $(__fl_sample3___win32rc) - $(CXX) -o $@ $(FL_SAMPLE3_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-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) + $(CXX) -o $@ $(FL_SAMPLE3_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-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) $(__fl_sample3___mac_rezcmd) $(__fl_sample3___mac_setfilecmd) + $(__fl_sample3___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -fl_sample3.app/Contents: fl_sample3$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +fl_sample3.app/Contents/PkgInfo: fl_sample3$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p fl_sample3.app/Contents mkdir -p fl_sample3.app/Contents/MacOS mkdir -p fl_sample3.app/Contents/Resources @@ -386,7 +373,7 @@ fl_sample3.app/Contents: fl_sample3$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/fl_sample3/" \ - -e "s/VERSION/2.5.0/" \ + -e "s/VERSION/$(WX_VERSION)/" \ $(top_srcdir)/src/mac/Info.plist.in >fl_sample3.app/Contents/Info.plist @@ -396,16 +383,16 @@ fl_sample3.app/Contents: fl_sample3$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in ln -f fl_sample3$(EXEEXT) fl_sample3.app/Contents/MacOS/fl_sample3 - ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc fl_sample3.app/Contents/Resources/fl_sample3.rsrc + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc fl_sample3.app/Contents/Resources/fl_sample3.rsrc ln -f $(top_srcdir)/src/mac/wxmac.icns fl_sample3.app/Contents/Resources/wxmac.icns -@COND_PLATFORM_MACOSX_1@fl_sample3_bundle: fl_sample3.app/Contents +@COND_PLATFORM_MACOSX_1@fl_sample3_bundle: fl_sample3.app/Contents/PkgInfo fl_sample3_fl_sample3.o: $(srcdir)/fl_sample3.cpp $(CXXC) -c -o $@ $(FL_SAMPLE3_CXXFLAGS) $< fl_sample3_fl_sample3_rc.o: $(srcdir)/fl_sample3.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_22) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_1_2) $(__INC_JPEG_p_1_1) $(__INC_PNG_p_18) $(__INC_ZLIB_p_1_3) $(__INC_ODBC_p_1_2) $(__INC_REGEX_p_1_3) $(__INC_EXPAT_p_19) --include-dir $(srcdir) $(__DLLFLAG_p_18) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/" + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_1) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_17) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/" install: all @@ -417,4 +404,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean fl_demo1_bundle fl_demo2_bundle fl_sample1_bundle fl_sample2_bundle fl_sample3_bundle install uninstall +.PHONY: all clean data_files distclean fl_demo1_bundle fl_demo2_bundle fl_sample1_bundle fl_sample2_bundle fl_sample3_bundle install uninstall