X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/75a0a7b7de0cb3d5645ec014b60431b5fa2c7095..4bc89de684848e796d151a10074218d2b88206d0:/samples/widgets/Makefile.in

diff --git a/samples/widgets/Makefile.in b/samples/widgets/Makefile.in
index fddfc1bfd9..7ec152c86e 100644
--- a/samples/widgets/Makefile.in
+++ b/samples/widgets/Makefile.in
@@ -19,6 +19,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
+NM = @NM@
 RESCOMP = @RESCOMP@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
 SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
@@ -33,12 +34,15 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
+DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
 WIDGETS_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	-I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
 	-I$(srcdir)/../../samples $(CXXFLAGS)
 WIDGETS_OBJECTS =  \
+	$(__widgets_os2_lib_res) \
 	widgets_button.o \
+	widgets_checkbox.o \
 	widgets_combobox.o \
 	widgets_gauge.o \
 	widgets_listbox.o \
@@ -50,7 +54,7 @@ WIDGETS_OBJECTS =  \
 	widgets_textctrl.o \
 	widgets_widgets.o \
 	$(__widgets___win32rc)
-WX_VERSION = 2.5.0
+WX_VERSION = 2.5.1
 
 ### Conditionally set variables: ###
 
@@ -86,7 +90,7 @@ 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 -o widgets$(EXEEXT) Carbon.r \
-	$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
+	$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.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)
@@ -102,8 +106,13 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_PLATFORM_MAC_1@__widgets___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
 @COND_PLATFORM_MAC_1@__widgets___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@	$(SETFILE) -a C widgets$(EXEEXT)
+COND_PLATFORM_OS2_1___widgets___os2_emxbindcmd = $(NM) widgets$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep widgets$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__widgets___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___widgets___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__widgets___win32rc = widgets_widgets_rc.o
 @COND_PLATFORM_MACOSX_1@__widgets_bundle___depname = widgets_bundle
+@COND_PLATFORM_OS2_1@__widgets_os2_lib_res = \
+@COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
@@ -125,12 +134,13 @@ install-strip: install
 uninstall: 
 
 widgets$(EXEEXT): $(WIDGETS_OBJECTS) $(__widgets___win32rc)
-	$(CXX) -o $@ $(WIDGETS_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(WIDGETS_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
 	$(__widgets___mac_rezcmd)
 	$(__widgets___mac_setfilecmd)
+	$(__widgets___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-widgets.app/Contents: widgets$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+widgets.app/Contents/PkgInfo: widgets$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
 	mkdir -p widgets.app/Contents
 	mkdir -p widgets.app/Contents/MacOS
 	mkdir -p widgets.app/Contents/Resources
@@ -148,14 +158,17 @@ widgets.app/Contents: widgets$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB
 	ln -f widgets$(EXEEXT) widgets.app/Contents/MacOS/widgets
 	
 	
-	ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc widgets.app/Contents/Resources/widgets.rsrc
-	ln -f $(top_srcdir)/src/mac/wxmac.icns widgets.app/Contents/Resources/wxmac.icns
+	ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc widgets.app/Contents/Resources/widgets.rsrc
+	ln -sf $(top_srcdir)/src/mac/wxmac.icns widgets.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@widgets_bundle: widgets.app/Contents
+@COND_PLATFORM_MACOSX_1@widgets_bundle: widgets.app/Contents/PkgInfo
 
 widgets_button.o: $(srcdir)/button.cpp
 	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $<
 
+widgets_checkbox.o: $(srcdir)/checkbox.cpp
+	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $<
+
 widgets_combobox.o: $(srcdir)/combobox.cpp
 	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $<
 
@@ -187,7 +200,7 @@ widgets_widgets.o: $(srcdir)/widgets.cpp
 	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $<
 
 widgets_widgets_rc.o: $(srcdir)/widgets.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
+	$(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 dependency info, if present: