X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cf9b63b38a7ed96d8a824256f1fb23565c0fb52a..4614c8e52801a1565198f352fdfc26ef9d3e5e5c:/contrib/build/mmedia/makefile.wat?ds=sidebyside diff --git a/contrib/build/mmedia/makefile.wat b/contrib/build/mmedia/makefile.wat index d15f4fa804..cb804e427c 100644 --- a/contrib/build/mmedia/makefile.wat +++ b/contrib/build/mmedia/makefile.wat @@ -115,6 +115,10 @@ __LIB_PNG_p = !ifeq USE_GUI 1 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif __WXLIB_CORE_p = !ifeq MONOLITHIC 0 __WXLIB_CORE_p = & @@ -211,11 +215,15 @@ __UNICODE_DEFINE_p = !ifeq UNICODE 1 __UNICODE_DEFINE_p = -d_UNICODE !endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif ### Variables: ### WX_RELEASE_NODOT = 27 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2 OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) LIBDIRNAME = ..\..\src\mmedia\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) @@ -224,10 +232,11 @@ SETUPHDIR = & MMEDIADLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\mmedia\..\..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\mmedia\..\..\include & - -dWXUSINGDLL -dWXMAKINGDLL_MMEDIA /fh=$(OBJS)\wxprec_mmediadll.pch & - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=..\..\src\mmedia\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & + -i=..\..\src\mmedia\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_MMEDIA & + /fh=$(OBJS)\wxprec_mmediadll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & + $(CPPFLAGS) $(CXXFLAGS) MMEDIADLL_OBJECTS = & $(OBJS)\mmediadll_dummy.obj & $(OBJS)\mmediadll_cdwin.obj & @@ -253,10 +262,10 @@ MMEDIADLL_OBJECTS = & MMEDIALIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\mmedia\..\..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\mmedia\..\..\include & - /fh=$(OBJS)\wxprec_mmedialib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & - $(CPPFLAGS) $(CXXFLAGS) + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=..\..\src\mmedia\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & + -i=..\..\src\mmedia\..\..\include /fh=$(OBJS)\wxprec_mmedialib.pch & + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) MMEDIALIB_OBJECTS = & $(OBJS)\mmedialib_dummy.obj & $(OBJS)\mmedialib_cdwin.obj & @@ -307,7 +316,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD @%append $(OBJS)\mmediadll.lbc option caseexact @%append $(OBJS)\mmediadll.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME) @for %i in ($(MMEDIADLL_OBJECTS)) do @%append $(OBJS)\mmediadll.lbc file %i - @for %i in ( $(__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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\mmediadll.lbc library %i + @for %i in ( $(__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) $(__GDIPLUS_LIB_p) 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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\mmediadll.lbc library %i @%append $(OBJS)\mmediadll.lbc option resource=$(OBJS)\mmediadll_version.res @%append $(OBJS)\mmediadll.lbc system nt_dll wlink @$(OBJS)\mmediadll.lbc @@ -321,11 +330,11 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD wlib -q -p4096 -n -b $^@ @$(OBJS)\mmedialib.lbc !endif -$(OBJS)\mmediadll_dummy.obj : .AUTODEPEND ../../src/mmedia\..\..\..\src\msw\dummy.cpp +$(OBJS)\mmediadll_dummy.obj : .AUTODEPEND ../../src/mmedia\..\..\..\src\common\dummy.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< $(OBJS)\mmediadll_version.res : .AUTODEPEND ../../src/mmedia\..\..\..\src\msw\version.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=$(SETUPHDIR) -i=..\..\src\mmedia\..\..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_wat$(VENDORTAG) $< + 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) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\mmedia\..\..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_wat$(VENDORTAG) $< $(OBJS)\mmediadll_cdwin.obj : .AUTODEPEND ../../src/mmedia\cdwin.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< @@ -387,7 +396,7 @@ $(OBJS)\mmediadll_sndwav.obj : .AUTODEPEND ../../src/mmedia\sndwav.cpp $(OBJS)\mmediadll_vidbase.obj : .AUTODEPEND ../../src/mmedia\vidbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< -$(OBJS)\mmedialib_dummy.obj : .AUTODEPEND ../../src/mmedia\..\..\..\src\msw\dummy.cpp +$(OBJS)\mmedialib_dummy.obj : .AUTODEPEND ../../src/mmedia\..\..\..\src\common\dummy.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< $(OBJS)\mmedialib_cdwin.obj : .AUTODEPEND ../../src/mmedia\cdwin.cpp