1) some compilers (Watcom) don't like it if wxBase library PCH file contains

[wxWidgets.git] / samples / controls / Makefile.in

diff --git a/samples/controls/Makefile.in b/samples/controls/Makefile.in
index 94265ab66e34981fa0f45a99a36107388c07b7ad..5d3a7e189a56a0bb26bd17873042c100589d56d7 100644 (file)
--- a/samples/controls/Makefile.in
+++ b/samples/controls/Makefile.in
@@ -35,7 +35,7 @@ top_srcdir = @top_srcdir@
 CONTROLS_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) \
 CONTROLS_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) $(CXXFLAGS)
+       -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS)

 CONTROLS_OBJECTS =  \
        controls_controls.o \
        $(__controls___win32rc)
 CONTROLS_OBJECTS =  \
        controls_controls.o \
        $(__controls___win32rc)


@@ -104,7 +104,7 @@ 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 \
        $(__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) \

-       $(__DLLFLAG_p_1) -o controls$(EXEEXT) Carbon.r \
+       $(__DLLFLAG_p_1) -i ../../samples -o controls$(EXEEXT) Carbon.r \

        $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
        $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \


@@ -141,7 +141,7 @@ controls_controls.o: $(srcdir)/controls.cpp
        $(CXXC) -c -o $@ $(CONTROLS_CXXFLAGS) $<
 
 controls_controls_rc.o: $(srcdir)/controls.rc
        $(CXXC) -c -o $@ $(CONTROLS_CXXFLAGS) $<
 
 controls_controls_rc.o: $(srcdir)/controls.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)
+       $(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 ../../samples

 
 distclean: clean
        rm -f configure config.cache config.log config.status
 
 distclean: clean
        rm -f configure config.cache config.log config.status