corrected DSW dependencies

[wxWidgets.git] / samples / opengl / penguin / makefile.wat

diff --git a/samples/opengl/penguin/makefile.wat b/samples/opengl/penguin/makefile.wat
index 41531ff33bf07d62f1616e9c3e5a980babc84163..b623f527bc5fbc361e263d634b673d32a1aabbe3 100644 (file)
--- a/samples/opengl/penguin/makefile.wat
+++ b/samples/opengl/penguin/makefile.wat
@@ -162,20 +162,18 @@ PENGUIN_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
        $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) &
        -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png &
        -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib &
-       -i=. $(__DLLFLAG_p) $(CFLAGS)
+       -i=. $(__DLLFLAG_p) -i=..\..\..\samples $(CFLAGS)
 PENGUIN_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
        $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) &
        -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png &
        -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib &
-       -i=. $(__DLLFLAG_p) $(CXXFLAGS)
+       -i=. $(__DLLFLAG_p) -i=..\..\..\samples $(CXXFLAGS)
 PENGUIN_OBJECTS =  &
        $(OBJS)\penguin_penguin.obj &
        $(OBJS)\penguin_lw.obj &
        $(OBJS)\penguin_trackball.obj
 
-MAKEARGS = BUILD=$(BUILD) CC=$(CC) CFG=$(CFG) CFLAGS=$(CFLAGS) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-
 
 all : $(OBJS)
 $(OBJS) :
@@ -192,7 +190,7 @@ $(OBJS)\penguin_penguin.obj :  .AUTODEPEND .\penguin.cpp
        $(CXX) -zq -fo=$^@ $(PENGUIN_CXXFLAGS) $<
 
 $(OBJS)\penguin_penguin.res :  .AUTODEPEND .\penguin.rc
-       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib  -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) $<
+       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib  -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=..\..\..\samples $<
 
 $(OBJS)\penguin_trackball.obj :  .AUTODEPEND .\trackball.c
        $(CC) -zq -fo=$^@ $(PENGUIN_CFLAGS) $<
@@ -215,6 +213,6 @@ $(OBJS)\penguin.exe :  $(PENGUIN_OBJECTS) $(OBJS)\penguin_penguin.res
        @%append $(OBJS)\penguin.lbc option incremental
        @%append $(OBJS)\penguin.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(PENGUIN_OBJECTS)) do @%append $(OBJS)\penguin.lbc file %i
-       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\penguin.lbc library %i
+       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\penguin.lbc library %i
        @%append $(OBJS)\penguin.lbc option resource=$(OBJS)\penguin_penguin.res
        wlink @$(OBJS)\penguin.lbc