X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e8f60bac1ab18be00b4e433f5db7b0261c5f17da..a85585d595c8409fa5e51a28e60fa49428440d5e:/samples/propsize/Makefile.in diff --git a/samples/propsize/Makefile.in b/samples/propsize/Makefile.in index 509a6b7496..10deca3c1a 100644 --- a/samples/propsize/Makefile.in +++ b/samples/propsize/Makefile.in @@ -13,11 +13,13 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ +EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ 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@ @@ -32,17 +34,21 @@ top_srcdir = @top_srcdir@ ### Variables: ### +DESTDIR = LIBDIRNAME = $(top_builddir)lib -PROPSIZE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +PROPSIZE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) + -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) PROPSIZE_OBJECTS = \ + $(__propsize_os2_lib_res) \ propsize_propsize.o \ $(__propsize___win32rc) -WX_VERSION = 2.5.0 +WX_VERSION = 2.5.1 ### Conditionally set variables: ### +@COND_DEPS_TRACKING_0@CXXC = $(CXX) +@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -72,8 +78,8 @@ WX_VERSION = 2.5.0 @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o propsize Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o propsize$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.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) @@ -87,18 +93,24 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__propsize___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__propsize___mac_setfilecmd = $(SETFILE) -a C propsize +@COND_PLATFORM_MAC_1@__propsize___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C propsize$(EXEEXT) +COND_PLATFORM_OS2_1___propsize___os2_emxbindcmd = $(NM) propsize$(EXEEXT) | if \ + grep -q pmwin.763 ; then emxbind -ep propsize$(EXEEXT) ; fi +@COND_PLATFORM_OS2_1@__propsize___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___propsize___os2_emxbindcmd) @COND_PLATFORM_WIN32_1@__propsize___win32rc = propsize_propsize_rc.o @COND_PLATFORM_MACOSX_1@__propsize_bundle___depname = propsize_bundle +@COND_PLATFORM_OS2_1@__propsize_os2_lib_res = \ +@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res ### Targets: ### -all: propsize $(__propsize_bundle___depname) +all: propsize$(EXEEXT) $(__propsize_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f propsize + rm -f propsize$(EXEEXT) rm -rf propsize.app distclean: clean @@ -108,13 +120,14 @@ install: all install-strip: install -propsize: $(PROPSIZE_OBJECTS) $(__propsize___win32rc) - $(CXX) -o $@ $(PROPSIZE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__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) +propsize$(EXEEXT): $(PROPSIZE_OBJECTS) $(__propsize___win32rc) + $(CXX) -o $@ $(PROPSIZE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__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) $(__propsize___mac_rezcmd) $(__propsize___mac_setfilecmd) + $(__propsize___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -propsize.app/Contents: propsize $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +propsize.app/Contents/PkgInfo: propsize$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p propsize.app/Contents mkdir -p propsize.app/Contents/MacOS mkdir -p propsize.app/Contents/Resources @@ -129,19 +142,19 @@ propsize.app/Contents: propsize $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME echo -n "APPL????" >propsize.app/Contents/PkgInfo - ln -f propsize propsize.app/Contents/MacOS/propsize + ln -f propsize$(EXEEXT) propsize.app/Contents/MacOS/propsize - ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc propsize.app/Contents/Resources/propsize.rsrc - ln -f $(top_srcdir)/src/mac/wxmac.icns propsize.app/Contents/Resources/wxmac.icns + ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc propsize.app/Contents/Resources/propsize.rsrc + ln -sf $(top_srcdir)/src/mac/wxmac.icns propsize.app/Contents/Resources/wxmac.icns -@COND_PLATFORM_MACOSX_1@propsize_bundle: propsize.app/Contents +@COND_PLATFORM_MACOSX_1@propsize_bundle: propsize.app/Contents/PkgInfo propsize_propsize.o: $(srcdir)/propsize.cpp - $(CXX) -c -o $@ $(PROPSIZE_CXXFLAGS) $< + $(CXXC) -c -o $@ $(PROPSIZE_CXXFLAGS) $< propsize_propsize_rc.o: $(srcdir)/propsize.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: