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:
@@ -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@
|
||||
CLIENT_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)
|
||||
CLIENT_OBJECTS = \
|
||||
$(__client___win32rc) \
|
||||
client_client.o
|
||||
@@ -43,7 +44,7 @@ LIBDIRNAME = $(top_builddir)lib
|
||||
SERVER_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)
|
||||
SERVER_OBJECTS = \
|
||||
$(__server___win32rc) \
|
||||
server_server.o
|
||||
@@ -111,15 +112,15 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
|
||||
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) -i $(top_srcdir)/include \
|
||||
$(__INC_TIFF_p_0) $(__INC_JPEG_p_6) $(__INC_PNG_p_6) $(__INC_ZLIB_p_0) \
|
||||
$(__INC_ODBC_p_0) $(__INC_REGEX_p_0) $(__INC_EXPAT_p_6) -i $(srcdir) \
|
||||
$(__DLLFLAG_p_6) -i ../../samples -o client$(EXEEXT) Carbon.r \
|
||||
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r
|
||||
$(__DLLFLAG_p_6) -i $(srcdir)/../../samples -o client$(EXEEXT) Carbon.r \
|
||||
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.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 $(top_srcdir)/include \
|
||||
$(__INC_TIFF_p_0) $(__INC_JPEG_p_6) $(__INC_PNG_p_6) $(__INC_ZLIB_p_0) \
|
||||
$(__INC_ODBC_p_0) $(__INC_REGEX_p_0) $(__INC_EXPAT_p_6) -i $(srcdir) \
|
||||
$(__DLLFLAG_p_6) -i ../../samples -o server$(EXEEXT) Carbon.r \
|
||||
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r
|
||||
$(__DLLFLAG_p_6) -i $(srcdir)/../../samples -o server$(EXEEXT) Carbon.r \
|
||||
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
|
||||
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_3 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3)
|
||||
@COND_MONOLITHIC_0@__WXLIB_BASE_p = \
|
||||
@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
|
||||
@@ -138,35 +139,62 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
|
||||
@COND_PLATFORM_MAC_1@__client___mac_setfilecmd = \
|
||||
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C client$(EXEEXT)
|
||||
@COND_PLATFORM_WIN32_1@__client___win32rc = client_sample_rc.o
|
||||
@COND_PLATFORM_MACOSX_1@__client_bundle___depname = client_bundle
|
||||
@COND_PLATFORM_MAC_1@__server___mac_rezcmd = $(__MACOSX_RESOURCES_p_3)
|
||||
@COND_PLATFORM_MAC_1@__server___mac_setfilecmd = \
|
||||
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C server$(EXEEXT)
|
||||
@COND_PLATFORM_WIN32_1@__server___win32rc = server_sample_rc.o
|
||||
@COND_PLATFORM_MACOSX_1@__server_bundle___depname = server_bundle
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: client$(EXEEXT) server$(EXEEXT)
|
||||
all: client$(EXEEXT) $(__client_bundle___depname) server$(EXEEXT) $(__server_bundle___depname)
|
||||
|
||||
clean:
|
||||
rm -rf ./.deps
|
||||
rm -rf ./.deps ./.pch
|
||||
rm -f ./*.o
|
||||
rm -f client$(EXEEXT)
|
||||
rm -rf client.app
|
||||
rm -f server$(EXEEXT)
|
||||
rm -rf server.app
|
||||
|
||||
client$(EXEEXT): $(CLIENT_OBJECTS) $(__client___win32rc)
|
||||
$(CXX) -o $@ $(CLIENT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
|
||||
$(__client___mac_rezcmd)
|
||||
$(__client___mac_setfilecmd)
|
||||
$(SAMPLES_RPATH_POSTLINK)
|
||||
|
||||
client.app/Contents: client$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
|
||||
mkdir -p client.app/Contents
|
||||
mkdir -p client.app/Contents/MacOS
|
||||
mkdir -p client.app/Contents/Resources
|
||||
|
||||
|
||||
sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
|
||||
-e "s/EXECUTABLE/client/" \
|
||||
-e "s/VERSION/2.5.0/" \
|
||||
$(top_srcdir)/src/mac/Info.plist.in >client.app/Contents/Info.plist
|
||||
|
||||
|
||||
echo -n "APPL????" >client.app/Contents/PkgInfo
|
||||
|
||||
|
||||
ln -f client$(EXEEXT) client.app/Contents/MacOS/client
|
||||
|
||||
|
||||
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc client.app/Contents/Resources/client.rsrc
|
||||
ln -f $(top_srcdir)/src/mac/wxmac.icns client.app/Contents/Resources/wxmac.icns
|
||||
|
||||
@COND_PLATFORM_MACOSX_1@client_bundle: client.app/Contents
|
||||
|
||||
client_client.o: $(srcdir)/client.cpp
|
||||
$(CXXC) -c -o $@ $(CLIENT_CXXFLAGS) $<
|
||||
|
||||
client_sample_rc.o: $(srcdir)/../../samples/sample.rc
|
||||
$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_6) $(__INC_JPEG_p_0) $(__INC_PNG_p_0) $(__INC_ZLIB_p_6) $(__INC_ODBC_p_6) $(__INC_REGEX_p_6) $(__INC_EXPAT_p_0) --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir ../../samples
|
||||
$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_6) $(__INC_JPEG_p_0) $(__INC_PNG_p_0) $(__INC_ZLIB_p_6) $(__INC_ODBC_p_6) $(__INC_REGEX_p_6) $(__INC_EXPAT_p_0) --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples
|
||||
|
||||
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
|
||||
|
||||
@@ -176,9 +204,33 @@ server$(EXEEXT): $(SERVER_OBJECTS) $(__server___win32rc)
|
||||
$(CXX) -o $@ $(SERVER_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
|
||||
$(__server___mac_rezcmd)
|
||||
$(__server___mac_setfilecmd)
|
||||
$(SAMPLES_RPATH_POSTLINK)
|
||||
|
||||
server.app/Contents: server$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
|
||||
mkdir -p server.app/Contents
|
||||
mkdir -p server.app/Contents/MacOS
|
||||
mkdir -p server.app/Contents/Resources
|
||||
|
||||
|
||||
sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
|
||||
-e "s/EXECUTABLE/server/" \
|
||||
-e "s/VERSION/2.5.0/" \
|
||||
$(top_srcdir)/src/mac/Info.plist.in >server.app/Contents/Info.plist
|
||||
|
||||
|
||||
echo -n "APPL????" >server.app/Contents/PkgInfo
|
||||
|
||||
|
||||
ln -f server$(EXEEXT) server.app/Contents/MacOS/server
|
||||
|
||||
|
||||
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc server.app/Contents/Resources/server.rsrc
|
||||
ln -f $(top_srcdir)/src/mac/wxmac.icns server.app/Contents/Resources/wxmac.icns
|
||||
|
||||
@COND_PLATFORM_MACOSX_1@server_bundle: server.app/Contents
|
||||
|
||||
server_sample_rc.o: $(srcdir)/../../samples/sample.rc
|
||||
$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_6) $(__INC_JPEG_p_0) $(__INC_PNG_p_0) $(__INC_ZLIB_p_6) $(__INC_ODBC_p_6) $(__INC_REGEX_p_6) $(__INC_EXPAT_p_0) --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir ../../samples
|
||||
$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_6) $(__INC_JPEG_p_0) $(__INC_PNG_p_0) $(__INC_ZLIB_p_6) $(__INC_ODBC_p_6) $(__INC_REGEX_p_6) $(__INC_EXPAT_p_0) --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples
|
||||
|
||||
server_server.o: $(srcdir)/server.cpp
|
||||
$(CXXC) -c -o $@ $(SERVER_CXXFLAGS) $<
|
||||
@@ -189,4 +241,4 @@ uninstall:
|
||||
# Include dependency info, if present:
|
||||
@IF_GNU_MAKE@-include .deps/*.d
|
||||
|
||||
.PHONY: all clean distclean install uninstall
|
||||
.PHONY: all clean client_bundle distclean install server_bundle uninstall
|
||||
|
Reference in New Issue
Block a user