Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

These two makefiles were *horrid* abominations.

Browse Source 
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:
Ron Lee
2000-03-18 21:15:16 +00:00
parent 99ad02720b
commit c56371028f
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/src/mmedia/Makefile.in
View File

@@ -3,9 +3,7 @@
top_srcdir = @top_srcdir@/.. top_srcdir = @top_srcdir@/..
top_builddir = ../../.. top_builddir = ../../..
VPATH= $(top_srcdir)/mmedia LIBTARGET=libmmedia
LIBTARGET=$(top_builddir)/contrib/lib/libmmedia
OBJECTS=cdbase.o cdwin.o g711.o g721.o g723_24.o \ OBJECTS=cdbase.o cdwin.o g711.o g721.o g723_24.o \
g723_40.o g72x.o sndaiff.o sndbase.o sndcodec.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 ':' # any VPATH assignment not containing ':'
VPATH = :$(top_srcdir)/contrib/src/mmedia # ':' for autoconf VPATH = :$(top_srcdir)/contrib/src/mmedia # ':' for autoconf
APPEXTRADEFS=-I$(top_srcdir)/contrib/include
include $(top_builddir)/src/makelib.env include $(top_builddir)/src/makelib.env

6
contrib/src/ogl/Makefile.in
View File

@@ -3,9 +3,7 @@
top_srcdir = @top_srcdir@/.. top_srcdir = @top_srcdir@/..
top_builddir = ../../.. top_builddir = ../../..
VPATH= $(top_srcdir)/ogl LIBTARGET=libogl
LIBTARGET=$(top_builddir)/contrib/lib/libogl
OBJECTS=basic.o bmpshape.o composit.o divided.o lines.o misc.o \ 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 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 ':' # any VPATH assignment not containing ':'
VPATH = :$(top_srcdir)/contrib/src/ogl # ':' for autoconf VPATH = :$(top_srcdir)/contrib/src/ogl # ':' for autoconf
APPEXTRADEFS=-I$(top_srcdir)/contrib/include
include $(top_builddir)/src/makelib.env include $(top_builddir)/src/makelib.env