[commit] r2358 - include generated sources in Mpeg3Plugin

 
Author: piumarta
Date: 2011-01-26 19:20:17 -0800 (Wed, 26 Jan 2011)
New Revision: 2358

Modified:
   trunk/platforms/unix/ChangeLog
   trunk/platforms/unix/cmake/Plugins.cmake
   trunk/platforms/unix/plugins/Mpeg3Plugin/config.cmake
Log:
include generated sources in Mpeg3Plugin

Modified: trunk/platforms/unix/ChangeLog
===================================================================
--- trunk/platforms/unix/ChangeLog 2011-01-24 01:31:57 UTC (rev 2357)
+++ trunk/platforms/unix/ChangeLog 2011-01-27 03:20:17 UTC (rev 2358)
@@ -1,3 +1,11 @@
+2011-01-27  Ian Piumarta  <com -dot- gmail -at- piumarta (backwards)>
+
+ * cmake/Plugins.cmake: Append ${plugin}_extra_sources to
+ automatically-generated plugin source list.
+
+ * plugins/Mpeg3Plugin/config.cmake: Disable pthreads unconditionally.
+ Add mpeg library files to plugin_extra_sources.
+
 2011-01-24  Ian Piumarta  <com -dot- gmail -at- piumarta (backwards)>
 
  * vm/sqUnixMain.c (sqGetFilenameFromString): Handle relative symlinks properly.

Modified: trunk/platforms/unix/cmake/Plugins.cmake
===================================================================
--- trunk/platforms/unix/cmake/Plugins.cmake 2011-01-24 01:31:57 UTC (rev 2357)
+++ trunk/platforms/unix/cmake/Plugins.cmake 2011-01-27 03:20:17 UTC (rev 2358)
@@ -1,6 +1,6 @@
 # Figure out which plugins to build and create a configuration for each.
 #
-# Last edited: 2009-09-17 09:34:24 by piumarta on ubuntu.piumarta.com
+# Last edited: 2011-01-27 12:16:13 by piumarta on emilia.ipe.media.kyoto-u.ac.jp
 
 FILE (STRINGS ${src}/plugins.int plugins_int)
 STRING (REGEX REPLACE ".*= (.*)" "\\1" plugins_int ${plugins_int})
@@ -49,6 +49,9 @@
       STRING_APPEND (plugin_sources "${tmp}")
     ENDFOREACH (dir)
   ENDIF (DEFINED ${plugin}_sources)
+  IF (DEFINED ${plugin}_extra_sources)
+    STRING_APPEND (plugin_sources "${${plugin}_extra_sources}")
+  ENDIF (DEFINED ${plugin}_extra_sources)
   FILE (WRITE ${bld}/${plugin}/CMakeLists.in "")
   FOREACH (dir ${unix}/plugins ${unix})
     FILE_APPEND (${bld}/${plugin}/CMakeLists.in ${dir}/${plugin}/build.cmake)

Modified: trunk/platforms/unix/plugins/Mpeg3Plugin/config.cmake
===================================================================
--- trunk/platforms/unix/plugins/Mpeg3Plugin/config.cmake 2011-01-24 01:31:57 UTC (rev 2357)
+++ trunk/platforms/unix/plugins/Mpeg3Plugin/config.cmake 2011-01-27 03:20:17 UTC (rev 2358)
@@ -2,15 +2,11 @@
   PLUGIN_DEFINITIONS (-DUSE_MMX=1)
 ENDIF ()
 
-PLUGIN_FIND_LIBRARY (PTHREAD pthread)
+PLUGIN_DEFINITIONS (-DNOPTHREADS=1)
 
-IF (NOT HAVE_LIBPTHREAD)
-  PLUGIN_DEFINITIONS (-DNOPTHREADS=1)
-ENDIF ()
-
 SET (lmp3 "${cross}/plugins/Mpeg3Plugin/libmpeg")
 
-LIST(APPEND ${plugin}_sources
+LIST(APPEND ${plugin}_extra_sources
   ${lmp3}/bitstream.c ${lmp3}/libmpeg3.c ${lmp3}/mpeg3atrack.c ${lmp3}/mpeg3demux.c ${lmp3}/mpeg3io.c
   ${lmp3}/mpeg3title.c ${lmp3}/mpeg3vtrack.c ${lmp3}/changesForSqueak.c
   ${lmp3}/audio/dct.c ${lmp3}/audio/header.c ${lmp3}/audio/layer2.c ${lmp3}/audio/layer3.c