Regenerated configure. Contains changes for:

[wxWidgets.git] / samples / splash / makefile.wat

diff --git a/samples/splash/makefile.wat b/samples/splash/makefile.wat
index 2b7ec171c3829c4b20dbaa65a67ac14728e52365..9ba42e6c301c6fc678d81849ee770b3d3c7a0106 100644 (file)
--- a/samples/splash/makefile.wat
+++ b/samples/splash/makefile.wat
@@ -55,6 +55,13 @@ WXDLLFLAG =
 !ifeq SHARED 1
 WXDLLFLAG = dll
 !endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
 __DEBUGINFO_0 =
 !ifeq BUILD debug
 !ifeq DEBUG_INFO default
@@ -125,6 +132,11 @@ __WXLIB_BASE_p =
 __WXLIB_BASE_p = &
        wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
 !endif
+__WXLIB_MEDIA_p =
+!ifeq MONOLITHIC 0
+__WXLIB_MEDIA_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
+!endif
 __WXLIB_MONO_p =
 !ifeq MONOLITHIC 1
 __WXLIB_MONO_p = &
@@ -180,8 +192,9 @@ SETUPHDIR = &
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 SPLASH_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 -wcd=667 -i=. &
+       $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) &
+       $(CXXFLAGS)
 SPLASH_OBJECTS =  &
        $(OBJS)\splash_splash.obj
 
@@ -208,13 +221,13 @@ $(OBJS)\splash.exe :  $(SPLASH_OBJECTS) $(OBJS)\splash_sample.res
        @%append $(OBJS)\splash.lbc option caseexact
        @%append $(OBJS)\splash.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(SPLASH_OBJECTS)) do @%append $(OBJS)\splash.lbc file %i
-       @for %i in ( $(__WXLIB_ADV_p)  $(__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   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)\splash.lbc library %i
+       @for %i in ( $(__WXLIB_ADV_p)   $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MEDIA_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)\splash.lbc library %i
        @%append $(OBJS)\splash.lbc option resource=$(OBJS)\splash_sample.res
        wlink @$(OBJS)\splash.lbc
 
 data : .SYMBOLIC 
        if not exist $(OBJS) mkdir $(OBJS)
-       for %f in (splash.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+       for %f in (splash.png press.mpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\splash_splash.obj :  .AUTODEPEND .\splash.cpp
        $(CXX) -zq -fo=$^@ $(SPLASH_CXXFLAGS) $<