Changeset 1412:a823790e30a3 in mediastreamer2

Timestamp:

Jun 27, 2011 1:25:54 AM (2 years ago)

Author:

laurent@…

Branch:

default

Children:

1413:fe6b03ac09de, 1416:faee05010bca

Message:

restore mediastreamer2 CMakeLists.txt (revert merge ​http://hg.qutecom.org/mediastreamer2/rev/b666a6c79a24)

File:

• src/CMakeLists.txt (modified) (2 diffs)

src/CMakeLists.txt

@@ -14 +14 @@
 set(MS_SRCS mscommon.c msfilter.c msqueue.c msticker.c alaw.c ulaw.c mssndcard.c msrtp.c
         dtmfgen.c ice.c tee.c msconf.c msjoin.c msvolume.c mswebcam.c mtu.c void.c eventqueue.c
-        dsptools.c kiss_fft.c  kiss_fftr.c equalizer.c audiostream.c tonedetector.c)
+        dsptools.c kiss_fft.c  kiss_fftr.c equalizer.c audiostream.c tonedetector.c itc.c audiomixer.c)
 
 add_definitions(-DMS2_INTERNAL)
@@ -37 +37 @@
 endif()
 
+add_definitions(-DMS2_INTERNAL)
+
 if(WIN32)
   include_directories(../build/win32native/)
-  set(MS_SRCS ${MS_SRCS} winsnd3.c ../build/win32native/mediastreamer2.def msfileplayer_win.c msfilerec_win.c)
-  
+  set(MS_SRCS ${MS_SRCS} winsnd3.c msfileplayer_win.c msfilerec_win.c)
 else(WIN32)
   set(MS_SRCS ${MS_SRCS} msfileplayer.c msfilerec.c)