X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/75a0a7b7de0cb3d5645ec014b60431b5fa2c7095..cffadd8447201d0e2e1b3de6f8a24b967da9140c:/samples/stc/Makefile.in

diff --git a/samples/stc/Makefile.in b/samples/stc/Makefile.in
index a309b229ad..ecd5b2e8eb 100644
--- a/samples/stc/Makefile.in
+++ b/samples/stc/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,14 +34,19 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
+DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-STCTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+STCTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	-I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-	-I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CXXFLAGS)
+	-I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CPPFLAGS) \
+	$(CXXFLAGS)
 STCTEST_OBJECTS =  \
 	$(__stctest___win32rc) \
-	stctest_stctest.o
-WX_VERSION = 2.5.0
+	$(__stctest_os2_lib_res) \
+	stctest_stctest.o \
+	stctest_edit.o \
+	stctest_prefs.o
+WX_VERSION = 2.5.1
 
 ### Conditionally set variables: ###
 
@@ -76,7 +82,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 -i $(srcdir)/../../include -o \
-	stctest$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
+	stctest$(EXEEXT) Carbon.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 = \
@@ -93,8 +99,13 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_PLATFORM_MAC_1@__stctest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
 @COND_PLATFORM_MAC_1@__stctest___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@	$(SETFILE) -a C stctest$(EXEEXT)
+COND_PLATFORM_OS2_1___stctest___os2_emxbindcmd = $(NM) stctest$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep stctest$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__stctest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___stctest___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__stctest___win32rc = stctest_sample_rc.o
 @COND_PLATFORM_MACOSX_1@__stctest_bundle___depname = stctest_bundle
+@COND_PLATFORM_OS2_1@__stctest_os2_lib_res = \
+@COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
@@ -122,12 +133,13 @@ install: all
 install-strip: install
 
 stctest$(EXEEXT): $(STCTEST_OBJECTS) $(__stctest___win32rc)
-	$(CXX) -o $@ $(STCTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-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)
+	$(CXX) -o $@ $(STCTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-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)
 	$(__stctest___mac_rezcmd)
 	$(__stctest___mac_setfilecmd)
+	$(__stctest___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-stctest.app/Contents: stctest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+stctest.app/Contents/PkgInfo: stctest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
 	mkdir -p stctest.app/Contents
 	mkdir -p stctest.app/Contents/MacOS
 	mkdir -p stctest.app/Contents/Resources
@@ -145,13 +157,19 @@ stctest.app/Contents: stctest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB
 	ln -f stctest$(EXEEXT) stctest.app/Contents/MacOS/stctest
 	
 	
-	ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc stctest.app/Contents/Resources/stctest.rsrc
-	ln -f $(top_srcdir)/src/mac/wxmac.icns stctest.app/Contents/Resources/wxmac.icns
+	ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc stctest.app/Contents/Resources/stctest.rsrc
+	ln -sf $(top_srcdir)/src/mac/wxmac.icns stctest.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@stctest_bundle: stctest.app/Contents
+@COND_PLATFORM_MACOSX_1@stctest_bundle: stctest.app/Contents/PkgInfo
+
+stctest_edit.o: $(srcdir)/edit.cpp
+	$(CXXC) -c -o $@ $(STCTEST_CXXFLAGS) $<
+
+stctest_prefs.o: $(srcdir)/prefs.cpp
+	$(CXXC) -c -o $@ $(STCTEST_CXXFLAGS) $<
 
 stctest_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
+	$(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
 
 stctest_stctest.o: $(srcdir)/stctest.cpp
 	$(CXXC) -c -o $@ $(STCTEST_CXXFLAGS) $<