Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

makefiles update with OSX fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-08-13 12:38:44 +00:00
parent 8bcf2d204f
commit ab892b9519
114 changed files with 4010 additions and 1077 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
contrib/samples/ogl/ogledit/Makefile.in
View File

@@ -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
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../../../../samples \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
-I$(srcdir)/../../../include $(CXXFLAGS)
OGLEDIT_OBJECTS = \
ogledit_ogledit.o \
@@ -108,9 +109,9 @@ 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 -i $(srcdir)/../../../include -o \
ogledit$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
../../../../samples/sample.r
$(__DLLFLAG_p_1) -i $(srcdir)/../../../../samples -i \
$(srcdir)/../../../include -o ogledit$(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,19 +128,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@COND_PLATFORM_MAC_1@__ogledit___mac_setfilecmd = \
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C ogledit$(EXEEXT)
@COND_PLATFORM_WIN32_1@__ogledit___win32rc = ogledit_ogledit_rc.o
@COND_PLATFORM_MACOSX_1@__ogledit_bundle___depname = ogledit_bundle
### Targets: ###
all: ogledit$(EXEEXT)
all: ogledit$(EXEEXT) $(__ogledit_bundle___depname)
clean:
rm -rf ./.deps
rm -rf ./.deps ./.pch
rm -f ./*.o
rm -f ogledit$(EXEEXT)
rm -rf ogledit.app
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
@@ -149,6 +151,30 @@ 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) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-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)
$(SAMPLES_RPATH_POSTLINK)
ogledit.app/Contents: ogledit$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
mkdir -p ogledit.app/Contents
mkdir -p ogledit.app/Contents/MacOS
mkdir -p ogledit.app/Contents/Resources
sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-e "s/EXECUTABLE/ogledit/" \
-e "s/VERSION/2.5.0/" \
$(top_srcdir)/src/mac/Info.plist.in >ogledit.app/Contents/Info.plist
echo -n "APPL????" >ogledit.app/Contents/PkgInfo
ln -f ogledit$(EXEEXT) ogledit.app/Contents/MacOS/ogledit
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc ogledit.app/Contents/Resources/ogledit.rsrc
ln -f $(top_srcdir)/src/mac/wxmac.icns ogledit.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@ogledit_bundle: ogledit.app/Contents
ogledit_doc.o: $(srcdir)/doc.cpp
$(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
@@ -157,7 +183,7 @@ ogledit_ogledit.o: $(srcdir)/ogledit.cpp
$(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
ogledit_ogledit_rc.o: $(srcdir)/ogledit.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 --include-dir $(srcdir)/../../../include
$(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-dir $(srcdir)/../../../include
ogledit_palette.o: $(srcdir)/palette.cpp
$(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
@@ -171,4 +197,4 @@ uninstall:
# Include dependency info, if present:
@IF_GNU_MAKE@-include .deps/*.d
.PHONY: all clean distclean install uninstall
.PHONY: all clean distclean install ogledit_bundle uninstall

46
contrib/samples/ogl/studio/Makefile.in
View File

@@ -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
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../../../../samples \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
-I$(srcdir)/../../../include $(CXXFLAGS)
OGLEDIT_OBJECTS = \
ogledit_studio.o \
@@ -114,9 +115,9 @@ 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 -i $(srcdir)/../../../include -o \
ogledit$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
../../../../samples/sample.r
$(__DLLFLAG_p_1) -i $(srcdir)/../../../../samples -i \
$(srcdir)/../../../include -o ogledit$(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)
@@ -133,15 +134,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@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_MACOSX_1@__ogledit_bundle___depname = ogledit_bundle
### Targets: ###
all: ogledit$(EXEEXT) data
all: ogledit$(EXEEXT) $(__ogledit_bundle___depname) data
clean:
rm -rf ./.deps
rm -rf ./.deps ./.pch
rm -f ./*.o
rm -f ogledit$(EXEEXT)
rm -rf ogledit.app
data:
@mkdir -p .
@@ -152,8 +155,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
@@ -163,6 +165,30 @@ 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)
$(SAMPLES_RPATH_POSTLINK)
ogledit.app/Contents: ogledit$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
mkdir -p ogledit.app/Contents
mkdir -p ogledit.app/Contents/MacOS
mkdir -p ogledit.app/Contents/Resources
sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-e "s/EXECUTABLE/ogledit/" \
-e "s/VERSION/2.5.0/" \
$(top_srcdir)/src/mac/Info.plist.in >ogledit.app/Contents/Info.plist
echo -n "APPL????" >ogledit.app/Contents/PkgInfo
ln -f ogledit$(EXEEXT) ogledit.app/Contents/MacOS/ogledit
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc ogledit.app/Contents/Resources/ogledit.rsrc
ln -f $(top_srcdir)/src/mac/wxmac.icns ogledit.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@ogledit_bundle: ogledit.app/Contents
ogledit_cspalette.o: $(srcdir)/cspalette.cpp
$(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
@@ -189,7 +215,7 @@ ogledit_studio.o: $(srcdir)/studio.cpp
$(CXXC) -c -o $@ $(OGLEDIT_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 ../../../../samples --include-dir $(srcdir)/../../../include
$(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-dir $(srcdir)/../../../include
ogledit_symbols.o: $(srcdir)/symbols.cpp
$(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
@@ -203,4 +229,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 ogledit_bundle uninstall