makefiles update with OSX fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -25,7 +25,7 @@ about:
|
||||
(cd about && $(MAKE) all)
|
||||
|
||||
clean:
|
||||
rm -rf ./.deps
|
||||
rm -rf ./.deps ./.pch
|
||||
rm -f ./*.o
|
||||
(cd about && $(MAKE) clean)
|
||||
(cd help && $(MAKE) clean)
|
||||
@@ -37,8 +37,7 @@ clean:
|
||||
(cd zip && $(MAKE) clean)
|
||||
|
||||
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
|
||||
|
||||
help:
|
||||
(cd help && $(MAKE) all)
|
||||
@@ -47,24 +46,8 @@ helpview:
|
||||
(cd helpview && $(MAKE) all)
|
||||
|
||||
install: all
|
||||
(cd about && $(MAKE) install)
|
||||
(cd help && $(MAKE) install)
|
||||
(cd helpview && $(MAKE) install)
|
||||
(cd printing && $(MAKE) install)
|
||||
(cd test && $(MAKE) install)
|
||||
(cd virtual && $(MAKE) install)
|
||||
(cd widget && $(MAKE) install)
|
||||
(cd zip && $(MAKE) install)
|
||||
|
||||
install-strip: install
|
||||
(cd about && $(MAKE) install-strip)
|
||||
(cd help && $(MAKE) install-strip)
|
||||
(cd helpview && $(MAKE) install-strip)
|
||||
(cd printing && $(MAKE) install-strip)
|
||||
(cd test && $(MAKE) install-strip)
|
||||
(cd virtual && $(MAKE) install-strip)
|
||||
(cd widget && $(MAKE) install-strip)
|
||||
(cd zip && $(MAKE) install-strip)
|
||||
|
||||
printing:
|
||||
(cd printing && $(MAKE) all)
|
||||
|
@@ -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@
|
||||
@@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@
|
||||
ABOUT_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../../../samples $(CXXFLAGS)
|
||||
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXFLAGS)
|
||||
ABOUT_OBJECTS = \
|
||||
about_about.o \
|
||||
$(__about___win32rc)
|
||||
@@ -104,8 +105,8 @@ 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 ../../../samples -o about$(EXEEXT) Carbon.r \
|
||||
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r
|
||||
$(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o about$(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_BASE_p = \
|
||||
@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
|
||||
@@ -125,26 +126,52 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
|
||||
@COND_PLATFORM_MAC_1@__about___mac_setfilecmd = \
|
||||
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C about$(EXEEXT)
|
||||
@COND_PLATFORM_WIN32_1@__about___win32rc = about_about_rc.o
|
||||
@COND_PLATFORM_MACOSX_1@__about_bundle___depname = about_bundle
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: about$(EXEEXT) data
|
||||
all: about$(EXEEXT) $(__about_bundle___depname) data
|
||||
|
||||
about$(EXEEXT): $(ABOUT_OBJECTS) $(__about___win32rc)
|
||||
$(CXX) -o $@ $(ABOUT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_HTML_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)
|
||||
$(__about___mac_rezcmd)
|
||||
$(__about___mac_setfilecmd)
|
||||
$(SAMPLES_RPATH_POSTLINK)
|
||||
|
||||
about.app/Contents: about$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
|
||||
mkdir -p about.app/Contents
|
||||
mkdir -p about.app/Contents/MacOS
|
||||
mkdir -p about.app/Contents/Resources
|
||||
|
||||
|
||||
sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
|
||||
-e "s/EXECUTABLE/about/" \
|
||||
-e "s/VERSION/2.5.0/" \
|
||||
$(top_srcdir)/src/mac/Info.plist.in >about.app/Contents/Info.plist
|
||||
|
||||
|
||||
echo -n "APPL????" >about.app/Contents/PkgInfo
|
||||
|
||||
|
||||
ln -f about$(EXEEXT) about.app/Contents/MacOS/about
|
||||
|
||||
|
||||
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc about.app/Contents/Resources/about.rsrc
|
||||
ln -f $(top_srcdir)/src/mac/wxmac.icns about.app/Contents/Resources/wxmac.icns
|
||||
|
||||
about_about.o: $(srcdir)/about.cpp
|
||||
$(CXXC) -c -o $@ $(ABOUT_CXXFLAGS) $<
|
||||
|
||||
about_about_rc.o: $(srcdir)/about.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 ../../../samples
|
||||
$(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)/../../../samples
|
||||
|
||||
@COND_PLATFORM_MACOSX_1@about_bundle: about.app/Contents
|
||||
|
||||
clean:
|
||||
rm -rf ./.deps
|
||||
rm -rf ./.deps ./.pch
|
||||
rm -f ./*.o
|
||||
rm -f about$(EXEEXT)
|
||||
rm -rf about.app
|
||||
|
||||
data:
|
||||
@mkdir -p ./data
|
||||
@@ -155,8 +182,7 @@ 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
|
||||
|
||||
@@ -168,4 +194,4 @@ uninstall:
|
||||
# Include dependency info, if present:
|
||||
@IF_GNU_MAKE@-include .deps/*.d
|
||||
|
||||
.PHONY: all clean data distclean install uninstall
|
||||
.PHONY: all about_bundle clean data distclean install uninstall
|
||||
|
@@ -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@
|
||||
@@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@
|
||||
HELP_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../../../samples $(CXXFLAGS)
|
||||
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXFLAGS)
|
||||
HELP_OBJECTS = \
|
||||
help_help.o \
|
||||
$(__help___win32rc)
|
||||
@@ -104,8 +105,8 @@ 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 ../../../samples -o help$(EXEEXT) Carbon.r \
|
||||
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r
|
||||
$(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o help$(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_BASE_p = \
|
||||
@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
|
||||
@@ -125,15 +126,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
|
||||
@COND_PLATFORM_MAC_1@__help___mac_setfilecmd = \
|
||||
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C help$(EXEEXT)
|
||||
@COND_PLATFORM_WIN32_1@__help___win32rc = help_help_rc.o
|
||||
@COND_PLATFORM_MACOSX_1@__help_bundle___depname = help_bundle
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: help$(EXEEXT) data
|
||||
all: help$(EXEEXT) $(__help_bundle___depname) data
|
||||
|
||||
clean:
|
||||
rm -rf ./.deps
|
||||
rm -rf ./.deps ./.pch
|
||||
rm -f ./*.o
|
||||
rm -f help$(EXEEXT)
|
||||
rm -rf help.app
|
||||
|
||||
data:
|
||||
@mkdir -p ./helpfiles
|
||||
@@ -144,19 +147,42 @@ 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
|
||||
|
||||
help$(EXEEXT): $(HELP_OBJECTS) $(__help___win32rc)
|
||||
$(CXX) -o $@ $(HELP_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_HTML_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)
|
||||
$(__help___mac_rezcmd)
|
||||
$(__help___mac_setfilecmd)
|
||||
$(SAMPLES_RPATH_POSTLINK)
|
||||
|
||||
help.app/Contents: help$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
|
||||
mkdir -p help.app/Contents
|
||||
mkdir -p help.app/Contents/MacOS
|
||||
mkdir -p help.app/Contents/Resources
|
||||
|
||||
|
||||
sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
|
||||
-e "s/EXECUTABLE/help/" \
|
||||
-e "s/VERSION/2.5.0/" \
|
||||
$(top_srcdir)/src/mac/Info.plist.in >help.app/Contents/Info.plist
|
||||
|
||||
|
||||
echo -n "APPL????" >help.app/Contents/PkgInfo
|
||||
|
||||
|
||||
ln -f help$(EXEEXT) help.app/Contents/MacOS/help
|
||||
|
||||
|
||||
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc help.app/Contents/Resources/help.rsrc
|
||||
ln -f $(top_srcdir)/src/mac/wxmac.icns help.app/Contents/Resources/wxmac.icns
|
||||
|
||||
@COND_PLATFORM_MACOSX_1@help_bundle: help.app/Contents
|
||||
|
||||
help_help.o: $(srcdir)/help.cpp
|
||||
$(CXXC) -c -o $@ $(HELP_CXXFLAGS) $<
|
||||
|
||||
help_help_rc.o: $(srcdir)/help.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 ../../../samples
|
||||
$(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)/../../../samples
|
||||
|
||||
install: all
|
||||
|
||||
@@ -168,4 +194,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 help_bundle install uninstall
|
||||
|
@@ -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@
|
||||
@@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@
|
||||
HELPVIEW_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../../../samples $(CXXFLAGS)
|
||||
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXFLAGS)
|
||||
HELPVIEW_OBJECTS = \
|
||||
helpview_helpview.o \
|
||||
$(__helpview___win32rc)
|
||||
@@ -104,8 +105,8 @@ 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 ../../../samples -o helpview$(EXEEXT) Carbon.r \
|
||||
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r
|
||||
$(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o helpview$(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_BASE_p = \
|
||||
@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
|
||||
@@ -125,15 +126,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
|
||||
@COND_PLATFORM_MAC_1@__helpview___mac_setfilecmd = \
|
||||
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C helpview$(EXEEXT)
|
||||
@COND_PLATFORM_WIN32_1@__helpview___win32rc = helpview_helpview_rc.o
|
||||
@COND_PLATFORM_MACOSX_1@__helpview_bundle___depname = helpview_bundle
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: helpview$(EXEEXT) data
|
||||
all: helpview$(EXEEXT) $(__helpview_bundle___depname) data
|
||||
|
||||
clean:
|
||||
rm -rf ./.deps
|
||||
rm -rf ./.deps ./.pch
|
||||
rm -f ./*.o
|
||||
rm -f helpview$(EXEEXT)
|
||||
rm -rf helpview.app
|
||||
|
||||
data:
|
||||
@mkdir -p .
|
||||
@@ -144,19 +147,42 @@ 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
|
||||
|
||||
helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc)
|
||||
$(CXX) -o $@ $(HELPVIEW_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_HTML_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)
|
||||
$(__helpview___mac_rezcmd)
|
||||
$(__helpview___mac_setfilecmd)
|
||||
$(SAMPLES_RPATH_POSTLINK)
|
||||
|
||||
helpview.app/Contents: helpview$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
|
||||
mkdir -p helpview.app/Contents
|
||||
mkdir -p helpview.app/Contents/MacOS
|
||||
mkdir -p helpview.app/Contents/Resources
|
||||
|
||||
|
||||
sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
|
||||
-e "s/EXECUTABLE/helpview/" \
|
||||
-e "s/VERSION/2.5.0/" \
|
||||
$(top_srcdir)/src/mac/Info.plist.in >helpview.app/Contents/Info.plist
|
||||
|
||||
|
||||
echo -n "APPL????" >helpview.app/Contents/PkgInfo
|
||||
|
||||
|
||||
ln -f helpview$(EXEEXT) helpview.app/Contents/MacOS/helpview
|
||||
|
||||
|
||||
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc helpview.app/Contents/Resources/helpview.rsrc
|
||||
ln -f $(top_srcdir)/src/mac/wxmac.icns helpview.app/Contents/Resources/wxmac.icns
|
||||
|
||||
@COND_PLATFORM_MACOSX_1@helpview_bundle: helpview.app/Contents
|
||||
|
||||
helpview_helpview.o: $(srcdir)/helpview.cpp
|
||||
$(CXXC) -c -o $@ $(HELPVIEW_CXXFLAGS) $<
|
||||
|
||||
helpview_helpview_rc.o: $(srcdir)/helpview.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 ../../../samples
|
||||
$(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)/../../../samples
|
||||
|
||||
install: all
|
||||
|
||||
@@ -168,4 +194,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 helpview_bundle install uninstall
|
||||
|
@@ -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@
|
||||
@@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib
|
||||
PRINTING_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../../../samples $(CXXFLAGS)
|
||||
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXFLAGS)
|
||||
PRINTING_OBJECTS = \
|
||||
printing_printing.o \
|
||||
$(__printing___win32rc)
|
||||
@@ -104,8 +105,8 @@ 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 ../../../samples -o printing$(EXEEXT) Carbon.r \
|
||||
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r
|
||||
$(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o printing$(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_BASE_p = \
|
||||
@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
|
||||
@@ -125,15 +126,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
|
||||
@COND_PLATFORM_MAC_1@__printing___mac_setfilecmd = \
|
||||
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C printing$(EXEEXT)
|
||||
@COND_PLATFORM_WIN32_1@__printing___win32rc = printing_printing_rc.o
|
||||
@COND_PLATFORM_MACOSX_1@__printing_bundle___depname = printing_bundle
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: printing$(EXEEXT) data
|
||||
all: printing$(EXEEXT) $(__printing_bundle___depname) data
|
||||
|
||||
clean:
|
||||
rm -rf ./.deps
|
||||
rm -rf ./.deps ./.pch
|
||||
rm -f ./*.o
|
||||
rm -f printing$(EXEEXT)
|
||||
rm -rf printing.app
|
||||
|
||||
data:
|
||||
@mkdir -p .
|
||||
@@ -144,8 +147,7 @@ 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
|
||||
|
||||
@@ -155,12 +157,36 @@ printing$(EXEEXT): $(PRINTING_OBJECTS) $(__printing___win32rc)
|
||||
$(CXX) -o $@ $(PRINTING_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_HTML_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)
|
||||
$(__printing___mac_rezcmd)
|
||||
$(__printing___mac_setfilecmd)
|
||||
$(SAMPLES_RPATH_POSTLINK)
|
||||
|
||||
printing.app/Contents: printing$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
|
||||
mkdir -p printing.app/Contents
|
||||
mkdir -p printing.app/Contents/MacOS
|
||||
mkdir -p printing.app/Contents/Resources
|
||||
|
||||
|
||||
sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
|
||||
-e "s/EXECUTABLE/printing/" \
|
||||
-e "s/VERSION/2.5.0/" \
|
||||
$(top_srcdir)/src/mac/Info.plist.in >printing.app/Contents/Info.plist
|
||||
|
||||
|
||||
echo -n "APPL????" >printing.app/Contents/PkgInfo
|
||||
|
||||
|
||||
ln -f printing$(EXEEXT) printing.app/Contents/MacOS/printing
|
||||
|
||||
|
||||
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc printing.app/Contents/Resources/printing.rsrc
|
||||
ln -f $(top_srcdir)/src/mac/wxmac.icns printing.app/Contents/Resources/wxmac.icns
|
||||
|
||||
@COND_PLATFORM_MACOSX_1@printing_bundle: printing.app/Contents
|
||||
|
||||
printing_printing.o: $(srcdir)/printing.cpp
|
||||
$(CXXC) -c -o $@ $(PRINTING_CXXFLAGS) $<
|
||||
|
||||
printing_printing_rc.o: $(srcdir)/printing.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 ../../../samples
|
||||
$(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)/../../../samples
|
||||
|
||||
uninstall:
|
||||
|
||||
@@ -168,4 +194,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 printing_bundle uninstall
|
||||
|
@@ -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@
|
||||
@@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib
|
||||
TEST_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../../../samples $(CXXFLAGS)
|
||||
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXFLAGS)
|
||||
TEST_OBJECTS = \
|
||||
test_test.o \
|
||||
$(__test___win32rc)
|
||||
@@ -104,8 +105,8 @@ 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 ../../../samples -o test$(EXEEXT) Carbon.r \
|
||||
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r
|
||||
$(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o test$(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_BASE_p = \
|
||||
@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
|
||||
@@ -127,15 +128,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
|
||||
@COND_PLATFORM_MAC_1@__test___mac_setfilecmd = \
|
||||
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C test$(EXEEXT)
|
||||
@COND_PLATFORM_WIN32_1@__test___win32rc = test_test_rc.o
|
||||
@COND_PLATFORM_MACOSX_1@__test_bundle___depname = test_bundle
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: test$(EXEEXT) data
|
||||
all: test$(EXEEXT) $(__test_bundle___depname) data
|
||||
|
||||
clean:
|
||||
rm -rf ./.deps
|
||||
rm -rf ./.deps ./.pch
|
||||
rm -f ./*.o
|
||||
rm -f test$(EXEEXT)
|
||||
rm -rf test.app
|
||||
|
||||
data:
|
||||
@mkdir -p .
|
||||
@@ -146,8 +149,7 @@ 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
|
||||
|
||||
@@ -157,12 +159,36 @@ test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc)
|
||||
$(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_HTML_p) $(__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)
|
||||
$(__test___mac_rezcmd)
|
||||
$(__test___mac_setfilecmd)
|
||||
$(SAMPLES_RPATH_POSTLINK)
|
||||
|
||||
test.app/Contents: test$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
|
||||
mkdir -p test.app/Contents
|
||||
mkdir -p test.app/Contents/MacOS
|
||||
mkdir -p test.app/Contents/Resources
|
||||
|
||||
|
||||
sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
|
||||
-e "s/EXECUTABLE/test/" \
|
||||
-e "s/VERSION/2.5.0/" \
|
||||
$(top_srcdir)/src/mac/Info.plist.in >test.app/Contents/Info.plist
|
||||
|
||||
|
||||
echo -n "APPL????" >test.app/Contents/PkgInfo
|
||||
|
||||
|
||||
ln -f test$(EXEEXT) test.app/Contents/MacOS/test
|
||||
|
||||
|
||||
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc test.app/Contents/Resources/test.rsrc
|
||||
ln -f $(top_srcdir)/src/mac/wxmac.icns test.app/Contents/Resources/wxmac.icns
|
||||
|
||||
@COND_PLATFORM_MACOSX_1@test_bundle: test.app/Contents
|
||||
|
||||
test_test.o: $(srcdir)/test.cpp
|
||||
$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
|
||||
|
||||
test_test_rc.o: $(srcdir)/test.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 ../../../samples
|
||||
$(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)/../../../samples
|
||||
|
||||
uninstall:
|
||||
|
||||
@@ -170,4 +196,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 test_bundle uninstall
|
||||
|
@@ -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@
|
||||
@@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib
|
||||
VIRTUAL_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../../../samples $(CXXFLAGS)
|
||||
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXFLAGS)
|
||||
VIRTUAL_OBJECTS = \
|
||||
virtual_virtual.o \
|
||||
$(__virtual___win32rc)
|
||||
@@ -104,8 +105,8 @@ 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 ../../../samples -o virtual$(EXEEXT) Carbon.r \
|
||||
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r
|
||||
$(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o virtual$(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_BASE_p = \
|
||||
@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
|
||||
@@ -125,15 +126,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
|
||||
@COND_PLATFORM_MAC_1@__virtual___mac_setfilecmd = \
|
||||
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C virtual$(EXEEXT)
|
||||
@COND_PLATFORM_WIN32_1@__virtual___win32rc = virtual_virtual_rc.o
|
||||
@COND_PLATFORM_MACOSX_1@__virtual_bundle___depname = virtual_bundle
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: virtual$(EXEEXT) data
|
||||
all: virtual$(EXEEXT) $(__virtual_bundle___depname) data
|
||||
|
||||
clean:
|
||||
rm -rf ./.deps
|
||||
rm -rf ./.deps ./.pch
|
||||
rm -f ./*.o
|
||||
rm -f virtual$(EXEEXT)
|
||||
rm -rf virtual.app
|
||||
|
||||
data:
|
||||
@mkdir -p .
|
||||
@@ -144,8 +147,7 @@ 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
|
||||
|
||||
@@ -157,15 +159,39 @@ virtual$(EXEEXT): $(VIRTUAL_OBJECTS) $(__virtual___win32rc)
|
||||
$(CXX) -o $@ $(VIRTUAL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_HTML_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)
|
||||
$(__virtual___mac_rezcmd)
|
||||
$(__virtual___mac_setfilecmd)
|
||||
$(SAMPLES_RPATH_POSTLINK)
|
||||
|
||||
virtual.app/Contents: virtual$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
|
||||
mkdir -p virtual.app/Contents
|
||||
mkdir -p virtual.app/Contents/MacOS
|
||||
mkdir -p virtual.app/Contents/Resources
|
||||
|
||||
|
||||
sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
|
||||
-e "s/EXECUTABLE/virtual/" \
|
||||
-e "s/VERSION/2.5.0/" \
|
||||
$(top_srcdir)/src/mac/Info.plist.in >virtual.app/Contents/Info.plist
|
||||
|
||||
|
||||
echo -n "APPL????" >virtual.app/Contents/PkgInfo
|
||||
|
||||
|
||||
ln -f virtual$(EXEEXT) virtual.app/Contents/MacOS/virtual
|
||||
|
||||
|
||||
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc virtual.app/Contents/Resources/virtual.rsrc
|
||||
ln -f $(top_srcdir)/src/mac/wxmac.icns virtual.app/Contents/Resources/wxmac.icns
|
||||
|
||||
@COND_PLATFORM_MACOSX_1@virtual_bundle: virtual.app/Contents
|
||||
|
||||
virtual_virtual.o: $(srcdir)/virtual.cpp
|
||||
$(CXXC) -c -o $@ $(VIRTUAL_CXXFLAGS) $<
|
||||
|
||||
virtual_virtual_rc.o: $(srcdir)/virtual.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 ../../../samples
|
||||
$(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)/../../../samples
|
||||
|
||||
|
||||
# Include dependency info, if present:
|
||||
@IF_GNU_MAKE@-include .deps/*.d
|
||||
|
||||
.PHONY: all clean data distclean install uninstall
|
||||
.PHONY: all clean data distclean install uninstall virtual_bundle
|
||||
|
@@ -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@
|
||||
@@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib
|
||||
WIDGET_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../../../samples $(CXXFLAGS)
|
||||
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXFLAGS)
|
||||
WIDGET_OBJECTS = \
|
||||
widget_widget.o \
|
||||
$(__widget___win32rc)
|
||||
@@ -104,8 +105,8 @@ 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 ../../../samples -o widget$(EXEEXT) Carbon.r \
|
||||
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r
|
||||
$(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o widget$(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_BASE_p = \
|
||||
@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
|
||||
@@ -125,15 +126,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
|
||||
@COND_PLATFORM_MAC_1@__widget___mac_setfilecmd = \
|
||||
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C widget$(EXEEXT)
|
||||
@COND_PLATFORM_WIN32_1@__widget___win32rc = widget_widget_rc.o
|
||||
@COND_PLATFORM_MACOSX_1@__widget_bundle___depname = widget_bundle
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: widget$(EXEEXT) data
|
||||
all: widget$(EXEEXT) $(__widget_bundle___depname) data
|
||||
|
||||
clean:
|
||||
rm -rf ./.deps
|
||||
rm -rf ./.deps ./.pch
|
||||
rm -f ./*.o
|
||||
rm -f widget$(EXEEXT)
|
||||
rm -rf widget.app
|
||||
|
||||
data:
|
||||
@mkdir -p .
|
||||
@@ -144,8 +147,7 @@ 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
|
||||
|
||||
@@ -157,15 +159,39 @@ widget$(EXEEXT): $(WIDGET_OBJECTS) $(__widget___win32rc)
|
||||
$(CXX) -o $@ $(WIDGET_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_HTML_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)
|
||||
$(__widget___mac_rezcmd)
|
||||
$(__widget___mac_setfilecmd)
|
||||
$(SAMPLES_RPATH_POSTLINK)
|
||||
|
||||
widget.app/Contents: widget$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
|
||||
mkdir -p widget.app/Contents
|
||||
mkdir -p widget.app/Contents/MacOS
|
||||
mkdir -p widget.app/Contents/Resources
|
||||
|
||||
|
||||
sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
|
||||
-e "s/EXECUTABLE/widget/" \
|
||||
-e "s/VERSION/2.5.0/" \
|
||||
$(top_srcdir)/src/mac/Info.plist.in >widget.app/Contents/Info.plist
|
||||
|
||||
|
||||
echo -n "APPL????" >widget.app/Contents/PkgInfo
|
||||
|
||||
|
||||
ln -f widget$(EXEEXT) widget.app/Contents/MacOS/widget
|
||||
|
||||
|
||||
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc widget.app/Contents/Resources/widget.rsrc
|
||||
ln -f $(top_srcdir)/src/mac/wxmac.icns widget.app/Contents/Resources/wxmac.icns
|
||||
|
||||
@COND_PLATFORM_MACOSX_1@widget_bundle: widget.app/Contents
|
||||
|
||||
widget_widget.o: $(srcdir)/widget.cpp
|
||||
$(CXXC) -c -o $@ $(WIDGET_CXXFLAGS) $<
|
||||
|
||||
widget_widget_rc.o: $(srcdir)/widget.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 ../../../samples
|
||||
$(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)/../../../samples
|
||||
|
||||
|
||||
# Include dependency info, if present:
|
||||
@IF_GNU_MAKE@-include .deps/*.d
|
||||
|
||||
.PHONY: all clean data distclean install uninstall
|
||||
.PHONY: all clean data distclean install uninstall widget_bundle
|
||||
|
@@ -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@
|
||||
@@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib
|
||||
ZIP_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../../../samples $(CXXFLAGS)
|
||||
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXFLAGS)
|
||||
ZIP_OBJECTS = \
|
||||
zip_zip.o \
|
||||
$(__zip___win32rc)
|
||||
@@ -104,8 +105,8 @@ 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 ../../../samples -o zip$(EXEEXT) Carbon.r \
|
||||
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r
|
||||
$(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o zip$(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_BASE_p = \
|
||||
@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
|
||||
@@ -124,15 +125,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
|
||||
@COND_PLATFORM_MAC_1@__zip___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
|
||||
@COND_PLATFORM_MAC_1@__zip___mac_setfilecmd = $(SETFILE) -a C zip$(EXEEXT)
|
||||
@COND_PLATFORM_WIN32_1@__zip___win32rc = zip_zip_rc.o
|
||||
@COND_PLATFORM_MACOSX_1@__zip_bundle___depname = zip_bundle
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: zip$(EXEEXT) data
|
||||
all: zip$(EXEEXT) $(__zip_bundle___depname) data
|
||||
|
||||
clean:
|
||||
rm -rf ./.deps
|
||||
rm -rf ./.deps ./.pch
|
||||
rm -f ./*.o
|
||||
rm -f zip$(EXEEXT)
|
||||
rm -rf zip.app
|
||||
|
||||
data:
|
||||
@mkdir -p .
|
||||
@@ -143,8 +146,7 @@ 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
|
||||
|
||||
@@ -156,15 +158,39 @@ zip$(EXEEXT): $(ZIP_OBJECTS) $(__zip___win32rc)
|
||||
$(CXX) -o $@ $(ZIP_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_HTML_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)
|
||||
$(__zip___mac_rezcmd)
|
||||
$(__zip___mac_setfilecmd)
|
||||
$(SAMPLES_RPATH_POSTLINK)
|
||||
|
||||
zip.app/Contents: zip$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
|
||||
mkdir -p zip.app/Contents
|
||||
mkdir -p zip.app/Contents/MacOS
|
||||
mkdir -p zip.app/Contents/Resources
|
||||
|
||||
|
||||
sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
|
||||
-e "s/EXECUTABLE/zip/" \
|
||||
-e "s/VERSION/2.5.0/" \
|
||||
$(top_srcdir)/src/mac/Info.plist.in >zip.app/Contents/Info.plist
|
||||
|
||||
|
||||
echo -n "APPL????" >zip.app/Contents/PkgInfo
|
||||
|
||||
|
||||
ln -f zip$(EXEEXT) zip.app/Contents/MacOS/zip
|
||||
|
||||
|
||||
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc zip.app/Contents/Resources/zip.rsrc
|
||||
ln -f $(top_srcdir)/src/mac/wxmac.icns zip.app/Contents/Resources/wxmac.icns
|
||||
|
||||
@COND_PLATFORM_MACOSX_1@zip_bundle: zip.app/Contents
|
||||
|
||||
zip_zip.o: $(srcdir)/zip.cpp
|
||||
$(CXXC) -c -o $@ $(ZIP_CXXFLAGS) $<
|
||||
|
||||
zip_zip_rc.o: $(srcdir)/zip.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 ../../../samples
|
||||
$(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)/../../../samples
|
||||
|
||||
|
||||
# Include dependency info, if present:
|
||||
@IF_GNU_MAKE@-include .deps/*.d
|
||||
|
||||
.PHONY: all clean data distclean install uninstall
|
||||
.PHONY: all clean data distclean install uninstall zip_bundle
|
||||
|
Reference in New Issue
Block a user