Regenerated makefiles

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

diff --git a/samples/opengl/cube/makefile.wat b/samples/opengl/cube/makefile.wat
index 1b4713b8ae5bbc91439cbd6edf046388ade035d1..e5b6e6b6c249797e13e860e6a8e2f690fc94355d 100644 (file)
--- a/samples/opengl/cube/makefile.wat
+++ b/samples/opengl/cube/makefile.wat
@@ -55,6 +55,17 @@ WXDLLFLAG =
 !ifeq SHARED 1
 WXDLLFLAG = dll
 !endif
 !ifeq SHARED 1
 WXDLLFLAG = dll
 !endif

+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__cube___depname =
+!ifeq USE_OPENGL 1
+__cube___depname = $(OBJS)\cube.exe
+!endif

 __DEBUGINFO_0 =
 !ifeq BUILD debug
 !ifeq DEBUG_INFO default
 __DEBUGINFO_0 =
 !ifeq BUILD debug
 !ifeq DEBUG_INFO default


@@ -127,15 +138,15 @@ __WXLIB_MONO_p = &
 !endif
 __LIB_TIFF_p =
 !ifeq USE_GUI 1
 !endif
 __LIB_TIFF_p =
 !ifeq USE_GUI 1

-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib

 !endif
 __LIB_JPEG_p =
 !ifeq USE_GUI 1
 !endif
 __LIB_JPEG_p =
 !ifeq USE_GUI 1

-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib

 !endif
 __LIB_PNG_p =
 !ifeq USE_GUI 1
 !endif
 __LIB_PNG_p =
 !ifeq USE_GUI 1

-__LIB_PNG_p = wxpng$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib

 !endif
 LIBDIRNAME =
 !ifeq SHARED 0
 !endif
 LIBDIRNAME =
 !ifeq SHARED 0


@@ -175,8 +186,9 @@ SETUPHDIR = &
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 CUBE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) &
        -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 CUBE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) &
        -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &

-       -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) &
-       -i=.\..\..\..\samples -dNOPCH $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS)
+       -i=.\..\..\..\include -i=$(SETUPHDIR) -wcd=549 -wcd=656 -wcd=657 -i=. &
+       $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__EXCEPTIONSFLAG_7) &
+       $(CPPFLAGS) $(CXXFLAGS)

 CUBE_OBJECTS =  &
        $(OBJS)\cube_cube.obj
 
 CUBE_OBJECTS =  &
        $(OBJS)\cube_cube.obj
 


@@ -187,7 +199,7 @@ $(OBJS) :
 
 ### Targets: ###
 
 
 ### Targets: ###
 

-all : .SYMBOLIC $(OBJS)\cube.exe
+all : .SYMBOLIC $(__cube___depname)

 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj


@@ -196,6 +208,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
        -if exist $(OBJS)\cube.exe del $(OBJS)\cube.exe
 
        -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
        -if exist $(OBJS)\cube.exe del $(OBJS)\cube.exe
 

+!ifeq USE_OPENGL 1

 $(OBJS)\cube.exe :  $(CUBE_OBJECTS) $(OBJS)\cube_cube.res
        @%create $(OBJS)\cube.lbc
        @%append $(OBJS)\cube.lbc option quiet
 $(OBJS)\cube.exe :  $(CUBE_OBJECTS) $(OBJS)\cube_cube.res
        @%create $(OBJS)\cube.lbc
        @%append $(OBJS)\cube.lbc option quiet


@@ -203,9 +216,10 @@ $(OBJS)\cube.exe :  $(CUBE_OBJECTS) $(OBJS)\cube_cube.res
        @%append $(OBJS)\cube.lbc option caseexact
        @%append $(OBJS)\cube.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(CUBE_OBJECTS)) do @%append $(OBJS)\cube.lbc file %i
        @%append $(OBJS)\cube.lbc option caseexact
        @%append $(OBJS)\cube.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(CUBE_OBJECTS)) do @%append $(OBJS)\cube.lbc file %i

-       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib wxexpat$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ) do @%append $(OBJS)\cube.lbc library %i
+       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ) do @%append $(OBJS)\cube.lbc library %i

        @%append $(OBJS)\cube.lbc option resource=$(OBJS)\cube_cube.res
        wlink @$(OBJS)\cube.lbc
        @%append $(OBJS)\cube.lbc option resource=$(OBJS)\cube_cube.res
        wlink @$(OBJS)\cube.lbc

+!endif

 
 $(OBJS)\cube_cube.obj :  .AUTODEPEND .\cube.cpp
        $(CXX) -zq -fo=$^@ $(CUBE_CXXFLAGS) $<
 
 $(OBJS)\cube_cube.obj :  .AUTODEPEND .\cube.cpp
        $(CXX) -zq -fo=$^@ $(CUBE_CXXFLAGS) $<