Applied patch [ 832096 ] Final separation for GUI and console for Open Watcom

[wxWidgets.git] / samples / html / widget / Makefile.in

diff --git a/samples/html/widget/Makefile.in b/samples/html/widget/Makefile.in
index edb6c41766c02e4b4a391be1955f1b4a90beb779..aa1c8cfa10b741cac33c0c81a988f92b6fa9fff9 100644 (file)
--- a/samples/html/widget/Makefile.in
+++ b/samples/html/widget/Makefile.in
@@ -16,9 +16,11 @@ CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
+EXTRALIBS_HTML = @EXTRALIBS_HTML@
 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 +35,15 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
+DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-WIDGET_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../../samples $(CXXFLAGS)
+WIDGET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
+       $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS)
 WIDGET_OBJECTS =  \
+       $(__widget_os2_lib_res) \
        widget_widget.o \
        $(__widget___win32rc)
-WX_VERSION = 2.5.0
+WX_VERSION = 2.5.1
 
 ### Conditionally set variables: ###
 
@@ -74,9 +77,9 @@ WX_VERSION = 2.5.0
 @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 -i $(srcdir) \
-       $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o widget$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
+       __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
+       $(srcdir)/../../../samples -o widget$(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 = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
@@ -95,8 +98,13 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_PLATFORM_MAC_1@__widget___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
 @COND_PLATFORM_MAC_1@__widget___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C widget$(EXEEXT)
+COND_PLATFORM_OS2_1___widget___os2_emxbindcmd = $(NM) widget$(EXEEXT) | if grep \
+       -q pmwin.763 ; then emxbind -ep widget$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__widget___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___widget___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__widget___win32rc = widget_widget_rc.o
 @COND_PLATFORM_MACOSX_1@__widget_bundle___depname = widget_bundle
+@COND_PLATFORM_OS2_1@__widget_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
@@ -126,12 +134,13 @@ install-strip: install
 uninstall: 
 
 widget$(EXEEXT): $(WIDGET_OBJECTS) $(__widget___win32rc)
-       $(CXX) -o $@ $(WIDGET_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 $@ $(WIDGET_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)
        $(__widget___mac_rezcmd)
        $(__widget___mac_setfilecmd)
+       $(__widget___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-widget.app/Contents: widget$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+widget.app/Contents/PkgInfo: widget$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
        mkdir -p widget.app/Contents
        mkdir -p widget.app/Contents/MacOS
        mkdir -p widget.app/Contents/Resources
@@ -149,16 +158,16 @@ widget.app/Contents: widget$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI
        ln -f widget$(EXEEXT) widget.app/Contents/MacOS/widget
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc widget.app/Contents/Resources/widget.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns widget.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc widget.app/Contents/Resources/widget.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns widget.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@widget_bundle: widget.app/Contents
+@COND_PLATFORM_MACOSX_1@widget_bundle: widget.app/Contents/PkgInfo
 
 widget_widget.o: $(srcdir)/widget.cpp
        $(CXXC) -c -o $@ $(WIDGET_CXXFLAGS) $<
 
 widget_widget_rc.o: $(srcdir)/widget.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 $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples
 
 
 # Include dependency info, if present: