SWIGged updates

[wxWidgets.git] / contrib / utils / wxrcedit / Makefile.in

diff --git a/contrib/utils/wxrcedit/Makefile.in b/contrib/utils/wxrcedit/Makefile.in
index 1e24c1739cd209459067987379f0b42e5a655310..4ac540c67909c63558efbf47562e13ae865882e7 100644 (file)
--- a/contrib/utils/wxrcedit/Makefile.in
+++ b/contrib/utils/wxrcedit/Makefile.in
@@ -22,6 +22,7 @@ INSTALL_DIR = @INSTALL_DIR@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@

+NM = @NM@

 RESCOMP = @RESCOMP@
 SETFILE = @SETFILE@
 STRIP = @STRIP@
 RESCOMP = @RESCOMP@
 SETFILE = @SETFILE@
 STRIP = @STRIP@


@@ -88,7 +89,7 @@ WXRCEDIT_OBJECTS =  \
 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 \
 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 \

-       wxrcedit$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
+       wxrcedit$(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_ADV_p = \
        sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 COND_MONOLITHIC_0___WXLIB_ADV_p = \


@@ -113,6 +114,9 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_PLATFORM_MAC_1@__wxrcedit___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
 @COND_PLATFORM_MAC_1@__wxrcedit___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C wxrcedit$(EXEEXT)
 @COND_PLATFORM_MAC_1@__wxrcedit___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
 @COND_PLATFORM_MAC_1@__wxrcedit___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C wxrcedit$(EXEEXT)

+COND_PLATFORM_OS2_1___wxrcedit___os2_emxbindcmd = $(NM) wxrcedit$(EXEEXT) | if \
+       grep -q pmwin.763 ; then emxbind -ep wxrcedit$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__wxrcedit___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___wxrcedit___os2_emxbindcmd)

 @COND_PLATFORM_WIN32_1@__wxrcedit___win32rc = wxrcedit_wxrcedit_rc.o
 
 ### Targets: ###
 @COND_PLATFORM_WIN32_1@__wxrcedit___win32rc = wxrcedit_wxrcedit_rc.o
 
 ### Targets: ###


@@ -142,6 +146,7 @@ wxrcedit$(EXEEXT): $(WXRCEDIT_OBJECTS) $(__wxrcedit___win32rc)
        $(CXX) -o $@ $(WXRCEDIT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(EXTRALIBS_XML) $(__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)
        $(__wxrcedit___mac_rezcmd)
        $(__wxrcedit___mac_setfilecmd)
        $(CXX) -o $@ $(WXRCEDIT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(EXTRALIBS_XML) $(__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)
        $(__wxrcedit___mac_rezcmd)
        $(__wxrcedit___mac_setfilecmd)

+       $(__wxrcedit___os2_emxbindcmd)

 
 wxrcedit_edapp.o: $(srcdir)/edapp.cpp
        $(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $<
 
 wxrcedit_edapp.o: $(srcdir)/edapp.cpp
        $(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $<


@@ -174,7 +179,7 @@ wxrcedit_splittree.o: $(srcdir)/splittree.cpp
        $(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $<
 
 wxrcedit_wxrcedit_rc.o: $(srcdir)/wxrcedit.rc
        $(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $<
 
 wxrcedit_wxrcedit_rc.o: $(srcdir)/wxrcedit.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 --include-dir $(srcdir)/../../include
+       $(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-dir $(srcdir)/../../include

 
 wxrcedit_xmlhelpr.o: $(srcdir)/xmlhelpr.cpp
        $(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $<
 
 wxrcedit_xmlhelpr.o: $(srcdir)/xmlhelpr.cpp
        $(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $<