From: Guilhem Lavaux <lavaux@easynet.fr>
Date: Sun, 16 Jan 2000 18:49:16 +0000 (+0000)
Subject: Tested wxMMedia2 on Cygwin B20. It works but it needs mmsystem.h.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/fc0200b94428b3a9d732abeaf0970b70ed380da3?ds=inline

Tested wxMMedia2 on Cygwin B20. It works but it needs mmsystem.h.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/utils/wxMMedia2/lib/makefile.g95 b/utils/wxMMedia2/lib/makefile.g95
index 225cd34a1f..f16de9e86c 100644
--- a/utils/wxMMedia2/lib/makefile.g95
+++ b/utils/wxMMedia2/lib/makefile.g95
@@ -11,6 +11,8 @@
 
 # updated mcf
 
+WXWIN=../../..
+
 top_srcdir = ../../..
 top_builddir = ../../..
 
@@ -18,11 +20,11 @@ VPATH= $(top_srcdir)/utils/wxMMedia2/lib
 
 LIBTARGET=libwxmmedia2
 
-OBJECTS=sndbase.o sndcodec.o sndpcm.o sndcpcm.o sndulaw.o sndfile.o sndoss.o\
-	sndaiff.o sndwav.o \
+OBJECTS=sndbase.o sndcodec.o sndpcm.o sndcpcm.o sndulaw.o sndfile.o \
+        sndaiff.o sndwav.o sndwin.o \
 	g711.o g721.o g723_24.o g723_40.o g72x.o \
-	cdbase.o cdunix.o \
-	vidbase.o vidxanm.o
+        sndg72x.o cdbase.o  \
+        vidbase.o
 
 # include $(top_builddir)/src/makelib.env
 include $(top_builddir)/src/makelib.g95
diff --git a/utils/wxMMedia2/sample/makefile.g95 b/utils/wxMMedia2/sample/makefile.g95
new file mode 100644
index 0000000000..d093478fa2
--- /dev/null
+++ b/utils/wxMMedia2/sample/makefile.g95
@@ -0,0 +1,17 @@
+#
+# File:         makefile.g95
+# Author:       Julian Smart
+# Created:      1999
+# Updated:
+# Copyright:    (c) Julian Smart, 1999
+#
+# Makefile for wxWindows sample (Cygwin/Mingw32).
+
+WXDIR = ../../..
+
+TARGET=test_med4
+OBJECTS = $(TARGET).o
+EXTRALIBS= ../lib/libwxmmedia2 -lwx -lwinmm
+
+include $(WXDIR)\src\makeprog.g95
+