Fixed redefinition of i

[wxWidgets.git] / contrib / samples / mmedia / Makefile.in

diff --git a/contrib/samples/mmedia/Makefile.in b/contrib/samples/mmedia/Makefile.in
index 6dff9a45c5528d45dea14fddbda7cc5c6af026cd..9d523ec544789819dc99666b2e96180cc8744979 100644 (file)
--- a/contrib/samples/mmedia/Makefile.in
+++ b/contrib/samples/mmedia/Makefile.in
@@ -13,6 +13,7 @@ INSTALL = @INSTALL@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@

+EXEEXT = @EXEEXT@

 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@


@@ -44,6 +45,8 @@ WX_VERSION = 2.5.0
 
 ### Conditionally set variables: ###
 
 
 ### 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
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon


@@ -74,7 +77,8 @@ WX_VERSION = 2.5.0
 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 -i $(srcdir)/../../include -o \
 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 -i $(srcdir)/../../include -o \

-       mmboard Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
+       mmboard$(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)
 @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)


@@ -88,18 +92,19 @@ 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@__mmboard___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
 @COND_PLATFORM_MAC_1@__mmboard___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)

-@COND_PLATFORM_MAC_1@__mmboard___mac_setfilecmd = $(SETFILE) -a C mmboard
+@COND_PLATFORM_MAC_1@__mmboard___mac_setfilecmd = \
+@COND_PLATFORM_MAC_1@  $(SETFILE) -a C mmboard$(EXEEXT)

 @COND_PLATFORM_WIN32_1@__mmboard___win32rc = mmboard_mmboard_rc.o
 @COND_PLATFORM_MACOSX_1@__mmboard_bundle___depname = mmboard_bundle
 
 ### Targets: ###
 
 @COND_PLATFORM_WIN32_1@__mmboard___win32rc = mmboard_mmboard_rc.o
 @COND_PLATFORM_MACOSX_1@__mmboard_bundle___depname = mmboard_bundle
 
 ### Targets: ###
 

-all: mmboard $(__mmboard_bundle___depname)
+all: mmboard$(EXEEXT) $(__mmboard_bundle___depname)

 
 clean: 
        rm -rf ./.deps ./.pch
        rm -f ./*.o
 
 clean: 
        rm -rf ./.deps ./.pch
        rm -f ./*.o

-       rm -f mmboard
+       rm -f mmboard$(EXEEXT)

        rm -rf mmboard.app
 
 distclean: clean
        rm -rf mmboard.app
 
 distclean: clean


@@ -109,13 +114,13 @@ install: all
 
 install-strip: install
 
 
 install-strip: install
 

-mmboard: $(MMBOARD_OBJECTS) $(__mmboard___win32rc)
+mmboard$(EXEEXT): $(MMBOARD_OBJECTS) $(__mmboard___win32rc)

        $(CXX) -o $@ $(MMBOARD_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-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)
        $(__mmboard___mac_rezcmd)
        $(__mmboard___mac_setfilecmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(CXX) -o $@ $(MMBOARD_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-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)
        $(__mmboard___mac_rezcmd)
        $(__mmboard___mac_setfilecmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-mmboard.app/Contents: mmboard $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+mmboard.app/Contents/PkgInfo: mmboard$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns

        mkdir -p mmboard.app/Contents
        mkdir -p mmboard.app/Contents/MacOS
        mkdir -p mmboard.app/Contents/Resources
        mkdir -p mmboard.app/Contents
        mkdir -p mmboard.app/Contents/MacOS
        mkdir -p mmboard.app/Contents/Resources


@@ -130,19 +135,19 @@ mmboard.app/Contents: mmboard $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/
        echo -n "APPL????" >mmboard.app/Contents/PkgInfo
        
        
        echo -n "APPL????" >mmboard.app/Contents/PkgInfo
        
        

-       ln -f mmboard mmboard.app/Contents/MacOS/mmboard
+       ln -f mmboard$(EXEEXT) mmboard.app/Contents/MacOS/mmboard

        
        
        ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc mmboard.app/Contents/Resources/mmboard.rsrc
        ln -f $(top_srcdir)/src/mac/wxmac.icns mmboard.app/Contents/Resources/wxmac.icns
 
        
        
        ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc mmboard.app/Contents/Resources/mmboard.rsrc
        ln -f $(top_srcdir)/src/mac/wxmac.icns mmboard.app/Contents/Resources/wxmac.icns
 

-@COND_PLATFORM_MACOSX_1@mmboard_bundle: mmboard.app/Contents
+@COND_PLATFORM_MACOSX_1@mmboard_bundle: mmboard.app/Contents/PkgInfo

 
 mmboard_mmbman.o: $(srcdir)/mmbman.cpp
 
 mmboard_mmbman.o: $(srcdir)/mmbman.cpp

-       $(CXX) -c -o $@ $(MMBOARD_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMBOARD_CXXFLAGS) $<

 
 mmboard_mmboard.o: $(srcdir)/mmboard.cpp
 
 mmboard_mmboard.o: $(srcdir)/mmboard.cpp

-       $(CXX) -c -o $@ $(MMBOARD_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MMBOARD_CXXFLAGS) $<

 
 mmboard_mmboard_rc.o: $(srcdir)/mmboard.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 --include-dir $(srcdir)/../../include
 
 mmboard_mmboard_rc.o: $(srcdir)/mmboard.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 --include-dir $(srcdir)/../../include