X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/15e8daecf594d38a57bc750f58de0ea33b79f4ee..3527f29c8769e09d796c547c0c309f8b86407012:/contrib/build/mmedia/makefile.gcc

diff --git a/contrib/build/mmedia/makefile.gcc b/contrib/build/mmedia/makefile.gcc
index 9ce02bcd98..d7f2a79ed1 100644
--- a/contrib/build/mmedia/makefile.gcc
+++ b/contrib/build/mmedia/makefile.gcc
@@ -4,7 +4,7 @@
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
-include ../../../build/config.gcc
+include ../../../build/msw/config.gcc
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
@@ -12,17 +12,11 @@ include ../../../build/config.gcc
 
 ### Variables: ###
 
-LIBDIRNAME = \
-	..\..\src\mmedia\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 MMEDIADLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
 	-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-	$(__UNICODE_DEFINE_p) -I..\..\src\mmedia\..\..\..\include -I$(LIBDIRNAME) \
-	-I..\..\src\mmedia\..\..\..\src\tiff -I..\..\src\mmedia\..\..\..\src\jpeg \
-	-I..\..\src\mmedia\..\..\..\src\png -I..\..\src\mmedia\..\..\..\src\zlib \
-	-I..\..\src\mmedia\..\..\..\src\regex \
-	-I..\..\src\mmedia\..\..\..\src\expat\lib \
-	-I..\..\src\mmedia\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_MMEDIA \
-	$(CXXFLAGS)
+	$(__UNICODE_DEFINE_p) -I..\..\src\mmedia\..\..\..\include -I$(SETUPHDIR) \
+	-Wall -I..\..\src\mmedia\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_MMEDIA \
+	$(CXXFLAGS) $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0)
 MMEDIADLL_OBJECTS =  \
 	$(OBJS)\mmediadll_dummy.o \
 	$(OBJS)\mmediadll_cdwin.o \
@@ -47,12 +41,9 @@ MMEDIADLL_OBJECTS =  \
 	$(OBJS)\mmediadll_vidbase.o
 MMEDIALIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
 	-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-	$(__UNICODE_DEFINE_p) -I..\..\src\mmedia\..\..\..\include -I$(LIBDIRNAME) \
-	-I..\..\src\mmedia\..\..\..\src\tiff -I..\..\src\mmedia\..\..\..\src\jpeg \
-	-I..\..\src\mmedia\..\..\..\src\png -I..\..\src\mmedia\..\..\..\src\zlib \
-	-I..\..\src\mmedia\..\..\..\src\regex \
-	-I..\..\src\mmedia\..\..\..\src\expat\lib \
-	-I..\..\src\mmedia\..\..\include $(CXXFLAGS)
+	$(__UNICODE_DEFINE_p) -I..\..\src\mmedia\..\..\..\include -I$(SETUPHDIR) \
+	-Wall -I..\..\src\mmedia\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG) \
+	$(__EXCEPTIONSFLAG_0)
 MMEDIALIB_OBJECTS =  \
 	$(OBJS)\mmedialib_dummy.o \
 	$(OBJS)\mmedialib_cdwin.o \
@@ -77,12 +68,20 @@ MMEDIALIB_OBJECTS =  \
 	$(OBJS)\mmedialib_vidbase.o
 OBJS = \
 	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+SETUPHDIR = \
+	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 
 ### Conditionally set variables: ###
 
 ifeq ($(GCC_VERSION),2.95)
 GCCFLAGS = -fvtable-thunks
 endif
+ifeq ($(SHARED),0)
+LIBDIRNAME = ..\..\src\mmedia\..\..\..\lib\gcc_lib$(CFG)
+endif
+ifeq ($(SHARED),1)
+LIBDIRNAME = ..\..\src\mmedia\..\..\..\lib\gcc_dll$(CFG)
+endif
 ifeq ($(USE_GUI),0)
 PORTNAME = base
 endif
@@ -136,6 +135,18 @@ endif
 ifeq ($(DEBUG_FLAG),1)
 __DEBUG_DEFINE_p = -D__WXDEBUG__
 endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG = -fno-rtti
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_0 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_0 = 
+endif
 ifeq ($(USE_GUI),1)
 __LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
 endif
@@ -152,7 +163,10 @@ ifeq ($(BUILD),release)
 __OPTIMIZEFLAG = -O2
 endif
 ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
 endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
@@ -170,7 +184,7 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 endif
 ifeq ($(SHARED),1)
 __mmediadll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_gcc$(VENDORTAG).dll
+	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_gcc$(VENDORTAG).dll
 endif
 ifeq ($(SHARED),0)
 __mmedialib___depname = \
@@ -186,141 +200,141 @@ $(OBJS):
 
 all: $(__mmediadll___depname) $(__mmedialib___depname)
 
-$(OBJS)\mmediadll_cdbase.o: ../../src/mmedia\cdbase.cpp
+$(OBJS)\mmediadll_cdbase.o: ../../src/mmedia/cdbase.cpp
 	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-$(OBJS)\mmediadll_cdwin.o: ../../src/mmedia\cdwin.cpp
+$(OBJS)\mmediadll_cdwin.o: ../../src/mmedia/cdwin.cpp
 	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-$(OBJS)\mmediadll_dummy.o: ../../src/mmedia\..\..\..\src\msw\dummy.cpp
+$(OBJS)\mmediadll_dummy.o: ../../src/mmedia/../../../src/msw/dummy.cpp
 	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-$(OBJS)\mmediadll_g711.o: ../../src/mmedia\g711.cpp
+$(OBJS)\mmediadll_g711.o: ../../src/mmedia/g711.cpp
 	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-$(OBJS)\mmediadll_g721.o: ../../src/mmedia\g721.cpp
+$(OBJS)\mmediadll_g721.o: ../../src/mmedia/g721.cpp
 	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-$(OBJS)\mmediadll_g723_24.o: ../../src/mmedia\g723_24.cpp
+$(OBJS)\mmediadll_g723_24.o: ../../src/mmedia/g723_24.cpp
 	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-$(OBJS)\mmediadll_g723_40.o: ../../src/mmedia\g723_40.cpp
+$(OBJS)\mmediadll_g723_40.o: ../../src/mmedia/g723_40.cpp
 	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-$(OBJS)\mmediadll_g72x.o: ../../src/mmedia\g72x.cpp
+$(OBJS)\mmediadll_g72x.o: ../../src/mmedia/g72x.cpp
 	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-$(OBJS)\mmediadll_sndaiff.o: ../../src/mmedia\sndaiff.cpp
+$(OBJS)\mmediadll_sndaiff.o: ../../src/mmedia/sndaiff.cpp
 	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-$(OBJS)\mmediadll_sndbase.o: ../../src/mmedia\sndbase.cpp
+$(OBJS)\mmediadll_sndbase.o: ../../src/mmedia/sndbase.cpp
 	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-$(OBJS)\mmediadll_sndcodec.o: ../../src/mmedia\sndcodec.cpp
+$(OBJS)\mmediadll_sndcodec.o: ../../src/mmedia/sndcodec.cpp
 	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-$(OBJS)\mmediadll_sndcpcm.o: ../../src/mmedia\sndcpcm.cpp
+$(OBJS)\mmediadll_sndcpcm.o: ../../src/mmedia/sndcpcm.cpp
 	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-$(OBJS)\mmediadll_sndfile.o: ../../src/mmedia\sndfile.cpp
+$(OBJS)\mmediadll_sndfile.o: ../../src/mmedia/sndfile.cpp
 	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-$(OBJS)\mmediadll_sndg72x.o: ../../src/mmedia\sndg72x.cpp
+$(OBJS)\mmediadll_sndg72x.o: ../../src/mmedia/sndg72x.cpp
 	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-$(OBJS)\mmediadll_sndmsad.o: ../../src/mmedia\sndmsad.cpp
+$(OBJS)\mmediadll_sndmsad.o: ../../src/mmedia/sndmsad.cpp
 	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-$(OBJS)\mmediadll_sndpcm.o: ../../src/mmedia\sndpcm.cpp
+$(OBJS)\mmediadll_sndpcm.o: ../../src/mmedia/sndpcm.cpp
 	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-$(OBJS)\mmediadll_sndulaw.o: ../../src/mmedia\sndulaw.cpp
+$(OBJS)\mmediadll_sndulaw.o: ../../src/mmedia/sndulaw.cpp
 	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-$(OBJS)\mmediadll_sndwav.o: ../../src/mmedia\sndwav.cpp
+$(OBJS)\mmediadll_sndwav.o: ../../src/mmedia/sndwav.cpp
 	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-$(OBJS)\mmediadll_sndwin.o: ../../src/mmedia\sndwin.cpp
+$(OBJS)\mmediadll_sndwin.o: ../../src/mmedia/sndwin.cpp
 	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-$(OBJS)\mmediadll_vidbase.o: ../../src/mmedia\vidbase.cpp
+$(OBJS)\mmediadll_vidbase.o: ../../src/mmedia/vidbase.cpp
 	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-$(OBJS)\mmediadll_vidwin.o: ../../src/mmedia\vidwin.cpp
+$(OBJS)\mmediadll_vidwin.o: ../../src/mmedia/vidwin.cpp
 	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $<
 
-$(OBJS)\mmedialib_cdbase.o: ../../src/mmedia\cdbase.cpp
+$(OBJS)\mmedialib_cdbase.o: ../../src/mmedia/cdbase.cpp
 	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-$(OBJS)\mmedialib_cdwin.o: ../../src/mmedia\cdwin.cpp
+$(OBJS)\mmedialib_cdwin.o: ../../src/mmedia/cdwin.cpp
 	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-$(OBJS)\mmedialib_dummy.o: ../../src/mmedia\..\..\..\src\msw\dummy.cpp
+$(OBJS)\mmedialib_dummy.o: ../../src/mmedia/../../../src/msw/dummy.cpp
 	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-$(OBJS)\mmedialib_g711.o: ../../src/mmedia\g711.cpp
+$(OBJS)\mmedialib_g711.o: ../../src/mmedia/g711.cpp
 	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-$(OBJS)\mmedialib_g721.o: ../../src/mmedia\g721.cpp
+$(OBJS)\mmedialib_g721.o: ../../src/mmedia/g721.cpp
 	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-$(OBJS)\mmedialib_g723_24.o: ../../src/mmedia\g723_24.cpp
+$(OBJS)\mmedialib_g723_24.o: ../../src/mmedia/g723_24.cpp
 	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-$(OBJS)\mmedialib_g723_40.o: ../../src/mmedia\g723_40.cpp
+$(OBJS)\mmedialib_g723_40.o: ../../src/mmedia/g723_40.cpp
 	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-$(OBJS)\mmedialib_g72x.o: ../../src/mmedia\g72x.cpp
+$(OBJS)\mmedialib_g72x.o: ../../src/mmedia/g72x.cpp
 	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-$(OBJS)\mmedialib_sndaiff.o: ../../src/mmedia\sndaiff.cpp
+$(OBJS)\mmedialib_sndaiff.o: ../../src/mmedia/sndaiff.cpp
 	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-$(OBJS)\mmedialib_sndbase.o: ../../src/mmedia\sndbase.cpp
+$(OBJS)\mmedialib_sndbase.o: ../../src/mmedia/sndbase.cpp
 	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-$(OBJS)\mmedialib_sndcodec.o: ../../src/mmedia\sndcodec.cpp
+$(OBJS)\mmedialib_sndcodec.o: ../../src/mmedia/sndcodec.cpp
 	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-$(OBJS)\mmedialib_sndcpcm.o: ../../src/mmedia\sndcpcm.cpp
+$(OBJS)\mmedialib_sndcpcm.o: ../../src/mmedia/sndcpcm.cpp
 	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-$(OBJS)\mmedialib_sndfile.o: ../../src/mmedia\sndfile.cpp
+$(OBJS)\mmedialib_sndfile.o: ../../src/mmedia/sndfile.cpp
 	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-$(OBJS)\mmedialib_sndg72x.o: ../../src/mmedia\sndg72x.cpp
+$(OBJS)\mmedialib_sndg72x.o: ../../src/mmedia/sndg72x.cpp
 	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-$(OBJS)\mmedialib_sndmsad.o: ../../src/mmedia\sndmsad.cpp
+$(OBJS)\mmedialib_sndmsad.o: ../../src/mmedia/sndmsad.cpp
 	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-$(OBJS)\mmedialib_sndpcm.o: ../../src/mmedia\sndpcm.cpp
+$(OBJS)\mmedialib_sndpcm.o: ../../src/mmedia/sndpcm.cpp
 	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-$(OBJS)\mmedialib_sndulaw.o: ../../src/mmedia\sndulaw.cpp
+$(OBJS)\mmedialib_sndulaw.o: ../../src/mmedia/sndulaw.cpp
 	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-$(OBJS)\mmedialib_sndwav.o: ../../src/mmedia\sndwav.cpp
+$(OBJS)\mmedialib_sndwav.o: ../../src/mmedia/sndwav.cpp
 	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-$(OBJS)\mmedialib_sndwin.o: ../../src/mmedia\sndwin.cpp
+$(OBJS)\mmedialib_sndwin.o: ../../src/mmedia/sndwin.cpp
 	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-$(OBJS)\mmedialib_vidbase.o: ../../src/mmedia\vidbase.cpp
+$(OBJS)\mmedialib_vidbase.o: ../../src/mmedia/vidbase.cpp
 	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
-$(OBJS)\mmedialib_vidwin.o: ../../src/mmedia\vidwin.cpp
+$(OBJS)\mmedialib_vidwin.o: ../../src/mmedia/vidwin.cpp
 	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $<
 
 clean: 
 	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_gcc$(VENDORTAG).dll
+	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_gcc$(VENDORTAG).dll
 	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.a
 	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.a
 
 ifeq ($(SHARED),1)
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_gcc$(VENDORTAG).dll: $(MMEDIADLL_OBJECTS)
-	$(CXX) -shared -o $@ $(MMEDIADLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_gcc$(VENDORTAG).dll: $(MMEDIADLL_OBJECTS)
+	$(CXX) -shared -o $@ $(MMEDIADLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
 endif
 
 ifeq ($(SHARED),0)