X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1a098d1ec2463d86e1a3a708d90e864ed17cdbb..335d31e0072cb86c917b59c22209242af6064123:/samples/opengl/penguin/Makefile.in diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in index 0732d09f80..9ed76f1489 100644 --- a/samples/opengl/penguin/Makefile.in +++ b/samples/opengl/penguin/Makefile.in @@ -39,12 +39,10 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -PENGUIN_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CPPFLAGS) $(CFLAGS) -PENGUIN_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) +PENGUIN_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CFLAGS) +PENGUIN_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) PENGUIN_OBJECTS = \ $(__penguin_os2_lib_res) \ penguin_penguin.o \ @@ -87,8 +85,8 @@ WX_VERSION = 2.5.1 @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 penguin$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../samples -o penguin$(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 = \ @@ -175,7 +173,7 @@ penguin_penguin.o: $(srcdir)/penguin.cpp $(CXXC) -c -o $@ $(PENGUIN_CXXFLAGS) $< penguin_penguin_rc.o: $(srcdir)/penguin.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 penguin_trackball.o: $(srcdir)/trackball.c $(CCC) -c -o $@ $(PENGUIN_CFLAGS) $<