unicode and linkage corrections

[wxWidgets.git] / samples / htlbox / Makefile.in

diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in
index 0972f672534d26e77f7a24540b9822ba78edc394..3fe05b12ef448d91baf0ce8a32376cf9da79e0a0 100644 (file)
--- a/samples/htlbox/Makefile.in
+++ b/samples/htlbox/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 htlbox Carbon.r \
+       $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o htlbox$(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 = \
@@ -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@__htlbox___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
-@COND_PLATFORM_MAC_1@__htlbox___mac_setfilecmd = $(SETFILE) -a C htlbox
+@COND_PLATFORM_MAC_1@__htlbox___mac_setfilecmd = \
+@COND_PLATFORM_MAC_1@  $(SETFILE) -a C htlbox$(EXEEXT)
 @COND_PLATFORM_WIN32_1@__htlbox___win32rc = htlbox_htlbox_rc.o
 @COND_PLATFORM_MACOSX_1@__htlbox_bundle___depname = htlbox_bundle
 
 ### Targets: ###
 
-all: htlbox $(__htlbox_bundle___depname)
+all: htlbox$(EXEEXT) $(__htlbox_bundle___depname)
 
 clean: 
        rm -rf ./.deps ./.pch
        rm -f ./*.o
-       rm -f htlbox
+       rm -f htlbox$(EXEEXT)
        rm -rf htlbox.app
 
 distclean: clean
        rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
-htlbox: $(HTLBOX_OBJECTS) $(__htlbox___win32rc)
+htlbox$(EXEEXT): $(HTLBOX_OBJECTS) $(__htlbox___win32rc)
        $(CXX) -o $@ $(HTLBOX_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_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)
        $(__htlbox___mac_rezcmd)
        $(__htlbox___mac_setfilecmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-htlbox.app/Contents: htlbox $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+htlbox.app/Contents/PkgInfo: htlbox$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
        mkdir -p htlbox.app/Contents
        mkdir -p htlbox.app/Contents/MacOS
        mkdir -p htlbox.app/Contents/Resources
@@ -128,16 +132,16 @@ htlbox.app/Contents: htlbox $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/li
        echo -n "APPL????" >htlbox.app/Contents/PkgInfo
        
        
-       ln -f htlbox htlbox.app/Contents/MacOS/htlbox
+       ln -f htlbox$(EXEEXT) htlbox.app/Contents/MacOS/htlbox
        
        
        ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc htlbox.app/Contents/Resources/htlbox.rsrc
        ln -f $(top_srcdir)/src/mac/wxmac.icns htlbox.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@htlbox_bundle: htlbox.app/Contents
+@COND_PLATFORM_MACOSX_1@htlbox_bundle: htlbox.app/Contents/PkgInfo
 
 htlbox_htlbox.o: $(srcdir)/htlbox.cpp
-       $(CXX) -c -o $@ $(HTLBOX_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(HTLBOX_CXXFLAGS) $<
 
 htlbox_htlbox_rc.o: $(srcdir)/htlbox.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