These two makefiles were *horrid* abominations.
In fact they still are. But at least now they have some _chance_ of actually working.. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -3,9 +3,7 @@
|
||||
top_srcdir = @top_srcdir@/..
|
||||
top_builddir = ../../..
|
||||
|
||||
VPATH= $(top_srcdir)/mmedia
|
||||
|
||||
LIBTARGET=$(top_builddir)/contrib/lib/libmmedia
|
||||
LIBTARGET=libmmedia
|
||||
|
||||
OBJECTS=cdbase.o cdwin.o g711.o g721.o g723_24.o \
|
||||
g723_40.o g72x.o sndaiff.o sndbase.o sndcodec.o \
|
||||
@@ -17,5 +15,7 @@ OBJECTS=cdbase.o cdwin.o g711.o g721.o g723_24.o \
|
||||
# any VPATH assignment not containing ':'
|
||||
VPATH = :$(top_srcdir)/contrib/src/mmedia # ':' for autoconf
|
||||
|
||||
APPEXTRADEFS=-I$(top_srcdir)/contrib/include
|
||||
|
||||
include $(top_builddir)/src/makelib.env
|
||||
|
||||
|
@@ -3,9 +3,7 @@
|
||||
top_srcdir = @top_srcdir@/..
|
||||
top_builddir = ../../..
|
||||
|
||||
VPATH= $(top_srcdir)/ogl
|
||||
|
||||
LIBTARGET=$(top_builddir)/contrib/lib/libogl
|
||||
LIBTARGET=libogl
|
||||
|
||||
OBJECTS=basic.o bmpshape.o composit.o divided.o lines.o misc.o \
|
||||
basic2.o canvas.o constrnt.o drawn.o mfutils.o ogldiag.o
|
||||
@@ -15,4 +13,6 @@ OBJECTS=basic.o bmpshape.o composit.o divided.o lines.o misc.o \
|
||||
# any VPATH assignment not containing ':'
|
||||
VPATH = :$(top_srcdir)/contrib/src/ogl # ':' for autoconf
|
||||
|
||||
APPEXTRADEFS=-I$(top_srcdir)/contrib/include
|
||||
|
||||
include $(top_builddir)/src/makelib.env
|
||||
|
Reference in New Issue
Block a user