X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e8f60bac1ab18be00b4e433f5db7b0261c5f17da..3d25fdeee21d8ea144e9fdbc4b632070ce95d095:/samples/grid/Makefile.in

diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in
index 03541790ad..2a806e9848 100644
--- a/samples/grid/Makefile.in
+++ b/samples/grid/Makefile.in
@@ -13,6 +13,7 @@ INSTALL = @INSTALL@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
+EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
@@ -43,6 +44,8 @@ WX_VERSION = 2.5.0
 
 ### 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,7 +75,7 @@ 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 grid Carbon.r \
+	$(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o grid$(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_ADV_p = \
@@ -90,30 +93,31 @@ 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@__grid___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
-@COND_PLATFORM_MAC_1@__grid___mac_setfilecmd = $(SETFILE) -a C grid
+@COND_PLATFORM_MAC_1@__grid___mac_setfilecmd = \
+@COND_PLATFORM_MAC_1@	$(SETFILE) -a C grid$(EXEEXT)
 @COND_PLATFORM_WIN32_1@__grid___win32rc = grid_griddemo_rc.o
 @COND_PLATFORM_MACOSX_1@__grid_bundle___depname = grid_bundle
 
 ### Targets: ###
 
-all: grid $(__grid_bundle___depname)
+all: grid$(EXEEXT) $(__grid_bundle___depname)
 
 clean: 
 	rm -rf ./.deps ./.pch
 	rm -f ./*.o
-	rm -f grid
+	rm -f grid$(EXEEXT)
 	rm -rf grid.app
 
 distclean: clean
 	rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
-grid: $(GRID_OBJECTS) $(__grid___win32rc)
+grid$(EXEEXT): $(GRID_OBJECTS) $(__grid___win32rc)
 	$(CXX) -o $@ $(GRID_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ADV_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)
 	$(__grid___mac_rezcmd)
 	$(__grid___mac_setfilecmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-grid.app/Contents: grid $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+grid.app/Contents/PkgInfo: grid$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
 	mkdir -p grid.app/Contents
 	mkdir -p grid.app/Contents/MacOS
 	mkdir -p grid.app/Contents/Resources
@@ -128,16 +132,16 @@ grid.app/Contents: grid $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_
 	echo -n "APPL????" >grid.app/Contents/PkgInfo
 	
 	
-	ln -f grid grid.app/Contents/MacOS/grid
+	ln -f grid$(EXEEXT) grid.app/Contents/MacOS/grid
 	
 	
 	ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc grid.app/Contents/Resources/grid.rsrc
 	ln -f $(top_srcdir)/src/mac/wxmac.icns grid.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@grid_bundle: grid.app/Contents
+@COND_PLATFORM_MACOSX_1@grid_bundle: grid.app/Contents/PkgInfo
 
 grid_griddemo.o: $(srcdir)/griddemo.cpp
-	$(CXX) -c -o $@ $(GRID_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(GRID_CXXFLAGS) $<
 
 grid_griddemo_rc.o: $(srcdir)/griddemo.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