changeset 210:a3391ce27d3e trunk

[svn] Build this thing in a proper two-stage process. As it hardlocks instead of playing it is not built by default yet.
author chainsaw
date Sat, 04 Nov 2006 06:05:38 -0800
parents 1922e0a308ad
children 0962114e7626
files ChangeLog src/sap/Makefile
diffstat 2 files changed, 12 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Nov 04 00:24:20 2006 -0800
+++ b/ChangeLog	Sat Nov 04 06:05:38 2006 -0800
@@ -1,3 +1,11 @@
+2006-11-04 08:24:20 +0000  Aaron Sheldon <asheldon@uiuc.edu>
+  revision [418]
+  compile nicely
+  
+  trunk/src/mplayer/interface.c |    2 +-
+  1 file changed, 1 insertion(+), 1 deletion(-)
+
+
 2006-11-04 08:17:54 +0000  Aaron Sheldon <asheldon@uiuc.edu>
   revision [416]
   Compile warning fixes, xmms->audacious in a window.
--- a/src/sap/Makefile	Sat Nov 04 00:24:20 2006 -0800
+++ b/src/sap/Makefile	Sat Nov 04 06:05:38 2006 -0800
@@ -2,22 +2,17 @@
 include ../../mk/init.mk
 
 OBJECTIVE_LIBS = libsapplug$(SHARED_SUFFIX)
-
-SAPLIB = saplib/pokey0.cxx saplib/pokey1.cxx saplib/sapCpu.cxx saplib/sapEngine.cxx saplib/sapPokey.cxx
+SUBDIRS = saplib
 
-TARGET = libsapplug.so
+LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
 
-LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR) $(SAPLIB)
-
-LIBADD += $(GTK_LIBS)
+LIBADD += $(GTK_LIBS) ./saplib/libsap.a
 
 SOURCES = fileinfo.c sapfile.c sap_plug.c
 
 CFLAGS   += $(GTK_CFLAGS) $(PICFLAGS) -I../../intl -I../..
 CXXFLAGS += $(GTK_CFLAGS) $(PICFLAGS) -I../../intl -I../..
 
-OBJECTS = ${SOURCES:.c=.o} $(SAPLIB:.cxx=.o)
-
-all:
+OBJECTS = ${SOURCES:.c=.o}
 
 include ../../mk/objective.mk