Move oleacc.lib from the VC++ projects/makefiles to libraries.h

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

diff --git a/samples/opengl/penguin/makefile.wat b/samples/opengl/penguin/makefile.wat
index c4735a01443fcd4f4a8ef394d9e1260ba0c4de71..32f0074fbc818632b4ed50cf5d7b1d9661890354 100644 (file)
--- a/samples/opengl/penguin/makefile.wat
+++ b/samples/opengl/penguin/makefile.wat
@@ -205,7 +205,7 @@ __DLLFLAG_p = -dWXUSINGDLL
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-WX_RELEASE_NODOT = 26
+WX_RELEASE_NODOT = 27

 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)


@@ -225,7 +225,7 @@ PENGUIN_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
        $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
 PENGUIN_OBJECTS =  &
        $(OBJS)\penguin_penguin.obj &
        $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
 PENGUIN_OBJECTS =  &
        $(OBJS)\penguin_penguin.obj &

-       $(OBJS)\penguin_lw.obj &
+       $(OBJS)\penguin_dxfrenderer.obj &

        $(OBJS)\penguin_trackball.obj
 
 
        $(OBJS)\penguin_trackball.obj
 
 


@@ -260,17 +260,17 @@ $(OBJS)\penguin.exe :  $(PENGUIN_OBJECTS) $(OBJS)\penguin_penguin.res
 
 data : .SYMBOLIC 
        if not exist $(OBJS) mkdir $(OBJS)
 
 data : .SYMBOLIC 
        if not exist $(OBJS) mkdir $(OBJS)

-       for %f in (penguin.lwo) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+       for %f in (penguin.dxf.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS)

 
 $(OBJS)\penguin_penguin.obj :  .AUTODEPEND .\penguin.cpp
        $(CXX) -zq -fo=$^@ $(PENGUIN_CXXFLAGS) $<
 
 
 $(OBJS)\penguin_penguin.obj :  .AUTODEPEND .\penguin.cpp
        $(CXX) -zq -fo=$^@ $(PENGUIN_CXXFLAGS) $<
 

-$(OBJS)\penguin_lw.obj :  .AUTODEPEND .\lw.cpp
+$(OBJS)\penguin_dxfrenderer.obj :  .AUTODEPEND .\dxfrenderer.cpp

        $(CXX) -zq -fo=$^@ $(PENGUIN_CXXFLAGS) $<
 
 $(OBJS)\penguin_trackball.obj :  .AUTODEPEND .\trackball.c
        $(CC) -zq -fo=$^@ $(PENGUIN_CFLAGS) $<
 
 $(OBJS)\penguin_penguin.res :  .AUTODEPEND .\penguin.rc
        $(CXX) -zq -fo=$^@ $(PENGUIN_CXXFLAGS) $<
 
 $(OBJS)\penguin_trackball.obj :  .AUTODEPEND .\trackball.c
        $(CC) -zq -fo=$^@ $(PENGUIN_CFLAGS) $<
 
 $(OBJS)\penguin_penguin.res :  .AUTODEPEND .\penguin.rc

-       wrc -q -ad -bt=nt -r -fo=$^@   -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<
+       wrc -q -ad -bt=nt -r -fo=$^@   -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<