wxID_PREFERENCES added for the preferences menu item

[wxWidgets.git] / samples / opengl / isosurf / Makefile.in

diff --git a/samples/opengl/isosurf/Makefile.in b/samples/opengl/isosurf/Makefile.in
index c25846e26c1072e76da6e8b40aecc220865e1b4b..c642784f4e85bef322adb9478eccce3c6d64c0c1 100644 (file)
--- a/samples/opengl/isosurf/Makefile.in
+++ b/samples/opengl/isosurf/Makefile.in
@@ -34,13 +34,13 @@ top_srcdir = @top_srcdir@
 ### Variables: ###
 
 ISOSURF_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
-       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-       -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXFLAGS)
+       -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
+       -I$(srcdir)/../../../samples $(CXXFLAGS)
 ISOSURF_OBJECTS =  \
-       isosurf_isosurf.o \
-       $(__isosurf___win32rc)
+       $(__isosurf___win32rc) \
+       isosurf_isosurf.o
 LIBDIRNAME = $(top_builddir)lib
+WX_VERSION = 2.5.0
 
 ### Conditionally set variables: ###
 
@@ -56,34 +56,6 @@ LIBDIRNAME = $(top_builddir)lib
 @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
-@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p = -I$(top_srcdir)/src/expat/lib
-@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p_1 = -i $(top_srcdir)/src/expat/lib
-@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p_2 = \
-@COND_WXUSE_EXPAT_BUILTIN@     --include-dir $(top_srcdir)/src/expat/lib
-@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg
-@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg
-@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \
-@COND_WXUSE_LIBJPEG_BUILTIN@   --include-dir $(top_srcdir)/src/jpeg
-@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc
-@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc
-@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \
-@COND_WXUSE_ODBC_BUILTIN@      --include-dir $(top_srcdir)/src/odbc
-@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png
-@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png
-@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \
-@COND_WXUSE_LIBPNG_BUILTIN@    --include-dir $(top_srcdir)/src/png
-@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex
-@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex
-@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \
-@COND_WXUSE_REGEX_BUILTIN@     --include-dir $(top_srcdir)/src/regex
-@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff
-@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff
-@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \
-@COND_WXUSE_LIBTIFF_BUILTIN@   --include-dir $(top_srcdir)/src/tiff
-@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib
-@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib
-@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \
-@COND_WXUSE_ZLIB_BUILTIN@      --include-dir $(top_srcdir)/src/zlib
 @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
 @COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)
 @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
@@ -102,9 +74,7 @@ LIBDIRNAME = $(top_builddir)lib
 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
 @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 \
-       $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
-       $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \
+       __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \
        $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o isosurf$(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)
@@ -122,7 +92,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_PLATFORM_MAC_1@__isosurf___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
 @COND_PLATFORM_MAC_1@__isosurf___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C isosurf$(EXEEXT)
-@COND_PLATFORM_WIN32_1@__isosurf___win32rc = isosurf_cube_rc.o
+@COND_PLATFORM_WIN32_1@__isosurf___win32rc = isosurf_sample_rc.o
 @COND_PLATFORM_MACOSX_1@__isosurf_bundle___depname = isosurf_bundle
 
 ### Targets: ###
@@ -156,7 +126,7 @@ isosurf$(EXEEXT): $(ISOSURF_OBJECTS) $(__isosurf___win32rc)
        $(__isosurf___mac_setfilecmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-isosurf.app/Contents: isosurf$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+isosurf.app/Contents/PkgInfo: isosurf$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
        mkdir -p isosurf.app/Contents
        mkdir -p isosurf.app/Contents/MacOS
        mkdir -p isosurf.app/Contents/Resources
@@ -164,7 +134,7 @@ isosurf.app/Contents: isosurf$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB
        
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/isosurf/" \
-       -e "s/VERSION/2.5.0/" \
+       -e "s/VERSION/$(WX_VERSION)/" \
        $(top_srcdir)/src/mac/Info.plist.in >isosurf.app/Contents/Info.plist
        
        
@@ -177,14 +147,14 @@ isosurf.app/Contents: isosurf$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB
        ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc isosurf.app/Contents/Resources/isosurf.rsrc
        ln -f $(top_srcdir)/src/mac/wxmac.icns isosurf.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@isosurf_bundle: isosurf.app/Contents
-
-isosurf_cube_rc.o: $(srcdir)/cube.rc
-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples
+@COND_PLATFORM_MACOSX_1@isosurf_bundle: isosurf.app/Contents/PkgInfo
 
 isosurf_isosurf.o: $(srcdir)/isosurf.cpp
        $(CXXC) -c -o $@ $(ISOSURF_CXXFLAGS) $<
 
+isosurf_sample_rc.o: $(srcdir)/../../../samples/sample.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
+
 uninstall: