Added TODO

[wxWidgets.git] / demos / forty / Makefile.in

diff --git a/demos/forty/Makefile.in b/demos/forty/Makefile.in
index 069a08f9dc91f995d666c739a6b19f0428f10db4..2500fe79633f607be260fae409e9c2852f53cb5f 100644 (file)
--- a/demos/forty/Makefile.in
+++ b/demos/forty/Makefile.in
@@ -16,6 +16,7 @@ CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
+EXTRALIBS_HTML = @EXTRALIBS_HTML@
 HOST_SUFFIX = @HOST_SUFFIX@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
@@ -34,10 +35,12 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
-FORTY_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+DESTDIR = 
+FORTY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../samples $(CXXFLAGS)
+       -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 FORTY_OBJECTS =  \
+       $(__forty_os2_lib_res) \
        forty_forty.o \
        forty_canvas.o \
        forty_card.o \
@@ -108,6 +111,8 @@ COND_PLATFORM_OS2_1___forty___os2_emxbindcmd = $(NM) forty$(EXEEXT) | if grep -q
 @COND_PLATFORM_OS2_1@__forty___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___forty___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__forty___win32rc = forty_forty_rc.o
 @COND_PLATFORM_MACOSX_1@__forty_bundle___depname = forty_bundle
+@COND_PLATFORM_OS2_1@__forty_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
@@ -123,7 +128,7 @@ distclean: clean
        rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 forty$(EXEEXT): $(FORTY_OBJECTS) $(__forty___win32rc)
-       $(CXX) -o $@ $(FORTY_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)
+       $(CXX) -o $@ $(FORTY_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
        $(__forty___mac_rezcmd)
        $(__forty___mac_setfilecmd)
        $(__forty___os2_emxbindcmd)
@@ -147,8 +152,8 @@ forty.app/Contents/PkgInfo: forty$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $
        ln -f forty$(EXEEXT) forty.app/Contents/MacOS/forty
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc forty.app/Contents/Resources/forty.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns forty.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc forty.app/Contents/Resources/forty.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns forty.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@forty_bundle: forty.app/Contents/PkgInfo