sync with last iem 1.15 !

svn path=/trunk/externals/iemlib/; revision=2611

4 files changed, 187 insertions, 187 deletions

diff --git a/src/iemlib2/iemlib2.dsp b/src/iemlib2/iemlib2.dsp
index d8c2966..0eee8d0 100644
--- a/src/iemlib2/iemlib2.dsp
+++ b/src/iemlib2/iemlib2.dsp
@@ -1,85 +1,85 @@
-# Microsoft Developer Studio Project File - Name="iemlib2" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** NICHT BEARBEITEN **
-
-# TARGTYPE "Win32 (x86) External Target" 0x0106
-
-CFG=iemlib2 - Win32 Debug
-!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
-!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
-!MESSAGE 
-!MESSAGE NMAKE /f "iemlib2.mak".
-!MESSAGE 
-!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
-!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
-!MESSAGE 
-!MESSAGE NMAKE /f "iemlib2.mak" CFG="iemlib2 - Win32 Debug"
-!MESSAGE 
-!MESSAGE Für die Konfiguration stehen zur Auswahl:
-!MESSAGE 
-!MESSAGE "iemlib2 - Win32 Release" (basierend auf  "Win32 (x86) External Target")
-!MESSAGE "iemlib2 - Win32 Debug" (basierend auf  "Win32 (x86) External Target")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "iemlib2 - Win32 Release"
-
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Cmd_Line "NMAKE /f makefile_win"
-# PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "makefile_win.exe"
-# PROP BASE Bsc_Name "makefile_win.bsc"
-# PROP BASE Target_Dir ""
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Cmd_Line "NMAKE /f makefile_win"
-# PROP Rebuild_Opt "/a"
-# PROP Target_File "iemlib2.exe"
-# PROP Bsc_Name "iemlib2.bsc"
-# PROP Target_Dir ""
-
-!ELSEIF  "$(CFG)" == "iemlib2 - Win32 Debug"
-
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Cmd_Line "NMAKE /f makefile_win"
-# PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "makefile_win.exe"
-# PROP BASE Bsc_Name "makefile_win.bsc"
-# PROP BASE Target_Dir ""
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Cmd_Line "NMAKE /f makefile_win"
-# PROP Rebuild_Opt "/a"
-# PROP Target_File "iemlib2.exe"
-# PROP Bsc_Name "iemlib2.bsc"
-# PROP Target_Dir ""
-
-!ENDIF 
-
-# Begin Target
-
-# Name "iemlib2 - Win32 Release"
-# Name "iemlib2 - Win32 Debug"
-
-!IF  "$(CFG)" == "iemlib2 - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "iemlib2 - Win32 Debug"
-
-!ENDIF 
-
-# Begin Source File
-
-SOURCE=.\makefile_win
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="iemlib2" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** NICHT BEARBEITEN **

+

+# TARGTYPE "Win32 (x86) External Target" 0x0106

+

+CFG=iemlib2 - Win32 Debug

+!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE

+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl

+!MESSAGE 

+!MESSAGE NMAKE /f "iemlib2.mak".

+!MESSAGE 

+!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben

+!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:

+!MESSAGE 

+!MESSAGE NMAKE /f "iemlib2.mak" CFG="iemlib2 - Win32 Debug"

+!MESSAGE 

+!MESSAGE Für die Konfiguration stehen zur Auswahl:

+!MESSAGE 

+!MESSAGE "iemlib2 - Win32 Release" (basierend auf  "Win32 (x86) External Target")

+!MESSAGE "iemlib2 - Win32 Debug" (basierend auf  "Win32 (x86) External Target")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+

+!IF  "$(CFG)" == "iemlib2 - Win32 Release"

+

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Cmd_Line "NMAKE /f makefile_win"

+# PROP BASE Rebuild_Opt "/a"

+# PROP BASE Target_File "makefile_win.exe"

+# PROP BASE Bsc_Name "makefile_win.bsc"

+# PROP BASE Target_Dir ""

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "Release"

+# PROP Cmd_Line "NMAKE /f makefile_win"

+# PROP Rebuild_Opt "/a"

+# PROP Target_File "iemlib2.exe"

+# PROP Bsc_Name "iemlib2.bsc"

+# PROP Target_Dir ""

+

+!ELSEIF  "$(CFG)" == "iemlib2 - Win32 Debug"

+

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Cmd_Line "NMAKE /f makefile_win"

+# PROP BASE Rebuild_Opt "/a"

+# PROP BASE Target_File "makefile_win.exe"

+# PROP BASE Bsc_Name "makefile_win.bsc"

+# PROP BASE Target_Dir ""

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "Debug"

+# PROP Intermediate_Dir "Debug"

+# PROP Cmd_Line "NMAKE /f makefile_win"

+# PROP Rebuild_Opt "/a"

+# PROP Target_File "iemlib2.exe"

+# PROP Bsc_Name "iemlib2.bsc"

+# PROP Target_Dir ""

+

+!ENDIF 

+

+# Begin Target

+

+# Name "iemlib2 - Win32 Release"

+# Name "iemlib2 - Win32 Debug"

+

+!IF  "$(CFG)" == "iemlib2 - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "iemlib2 - Win32 Debug"

+

+!ENDIF 

+

+# Begin Source File

+

+SOURCE=.\makefile_win

+# End Source File

+# End Target

+# End Project

diff --git a/src/iemlib2/iemlib2.dsw b/src/iemlib2/iemlib2.dsw
index 2226931..4cf6c56 100644
--- a/src/iemlib2/iemlib2.dsw
+++ b/src/iemlib2/iemlib2.dsw
@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNUNG: DIESE ARBEITSBEREICHSDATEI DARF NICHT BEARBEITET ODER GELÖSCHT WERDEN!
-
-###############################################################################
-
-Project: "iemlib2"=.\iemlib2.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 6.00

+# WARNUNG: DIESE ARBEITSBEREICHSDATEI DARF NICHT BEARBEITET ODER GELÖSCHT WERDEN!

+

+###############################################################################

+

+Project: "iemlib2"=.\iemlib2.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Global:

+

+Package=<5>

+{{{

+}}}

+

+Package=<3>

+{{{

+}}}

+

+###############################################################################

+

diff --git a/src/iemlib2/makefile b/src/iemlib2/makefile
index d44bf58..5e5c173 100644
--- a/src/iemlib2/makefile
+++ b/src/iemlib2/makefile
@@ -2,14 +2,14 @@ current: all
 
 .SUFFIXES: .pd_linux
 
-INCLUDE = -I. -I/usr/local/src/pd/src
+INCLUDE = -I. -I/usr/local/src/pd-0.37-4/src
 
 LDFLAGS = -export-dynamic -shared
 LIB = -ldl -lm -lpthread
 
 #select either the DBG and OPT compiler flags below:
 
-CFLAGS = -DPD -DUNIX -Wall -W -Werror -Wno-unused \
+CFLAGS = -DPD -DUNIX -W -Werror -Wno-unused \
 	-Wno-parentheses -Wno-switch -O6 -funroll-loops -fomit-frame-pointer \
         -DDL_OPEN
 
diff --git a/src/iemlib2/makefile_win b/src/iemlib2/makefile_win
index 21e5678..3ac709d 100644
--- a/src/iemlib2/makefile_win
+++ b/src/iemlib2/makefile_win
@@ -1,71 +1,71 @@
-
-all: ..\..\lib\iemlib2.dll
-
-VIS_CPP_PATH = "C:\Programme\Microsoft Visual Studio\Vc98"
-
-PD_INST_PATH = "C:\Programme\pd"
-
-PD_WIN_INCLUDE_PATH = /I. /I$(PD_INST_PATH)\src /I$(VIS_CPP_PATH)\include
-
-PD_WIN_C_FLAGS = /nologo /W3 /WX /DMSW /DNT /DPD /DWIN32 /DWINDOWS /Ox -DPA_LITTLE_ENDIAN
-
-PD_WIN_L_FLAGS = /nologo
-
-PD_WIN_LIB = /NODEFAULTLIB:libc /NODEFAULTLIB:oldnames /NODEFAULTLIB:kernel /NODEFAULTLIB:uuid \
-	$(VIS_CPP_PATH)\lib\libc.lib \
-	$(VIS_CPP_PATH)\lib\oldnames.lib \
-	$(VIS_CPP_PATH)\lib\kernel32.lib \
-	$(VIS_CPP_PATH)\lib\wsock32.lib \
-	$(VIS_CPP_PATH)\lib\winmm.lib \
-	$(PD_INST_PATH)\bin\pthreadVC.lib \
-	$(PD_INST_PATH)\bin\pd.lib
-
-
-SRC =	add2_comma.c \
-		bpe.c \
-		dollarg.c \
-		exp_inc.c \
-		float24.c \
-		iem_anything_kernel.c \
-		iem_append_kernel.c \
-		iem_i_route.c \
-		iem_pbank_csv.c \
-		iem_prepend_kernel.c \
-		iem_receive_kernel.c \
-		iem_route.c \
-		iem_sel_any.c \
-		iem_send_kernel.c \
-		init.c \
-		list2send.c \
-		mergefilename.c \
-		modulo_counter.c \
-		post_netreceive.c \
-		pre_inlet.c \
-		prepend_ascii.c \
-		round_zero.c \
-		sigfade.c \
-		sigiem_blocksize.c \
-		sigiem_samplerate.c \
-		sigLFO_noise.c \
-		sigm2f.c \
-		speedlim.c \
-		splitfilename.c \
-		stripfilename.c \
-		toggle_mess.c \
-		transf_fader.c \
-		unsymbol.c \
-		wrap.c \
-		iemlib2.c
-
-
-OBJ = $(SRC:.c=.obj)
-
-.c.obj:
-	cl $(PD_WIN_C_FLAGS) $(PD_WIN_INCLUDE_PATH) /c $*.c
-
-..\..\lib\iemlib2.dll: $(OBJ)
-	link $(PD_WIN_L_FLAGS) /dll /export:iemlib2_setup \
-	/out:..\..\lib\iemlib2.dll $(OBJ) $(PD_WIN_LIB)
-
-clean:
-	del *.obj
+

+all: ..\..\lib\iemlib2.dll

+

+VIS_CPP_PATH = "C:\Programme\Microsoft Visual Studio\Vc98"

+

+PD_INST_PATH = "C:\Programme\pd-0.37-3"

+

+PD_WIN_INCLUDE_PATH = /I. /I$(PD_INST_PATH)\src /I$(VIS_CPP_PATH)\include

+

+PD_WIN_C_FLAGS = /nologo /W3 /WX /DMSW /DNT /DPD /DWIN32 /DWINDOWS /Ox -DPA_LITTLE_ENDIAN

+

+PD_WIN_L_FLAGS = /nologo

+

+PD_WIN_LIB = /NODEFAULTLIB:libc /NODEFAULTLIB:oldnames /NODEFAULTLIB:kernel /NODEFAULTLIB:uuid \

+	$(VIS_CPP_PATH)\lib\libc.lib \

+	$(VIS_CPP_PATH)\lib\oldnames.lib \

+	$(VIS_CPP_PATH)\lib\kernel32.lib \

+	$(VIS_CPP_PATH)\lib\wsock32.lib \

+	$(VIS_CPP_PATH)\lib\winmm.lib \

+	$(PD_INST_PATH)\bin\pthreadVC.lib \

+	$(PD_INST_PATH)\bin\pd.lib

+

+

+SRC =	add2_comma.c \

+		bpe.c \

+		dollarg.c \

+		exp_inc.c \

+		float24.c \

+		iem_anything_kernel.c \

+		iem_append_kernel.c \

+		iem_i_route.c \

+		iem_pbank_csv.c \

+		iem_prepend_kernel.c \

+		iem_receive_kernel.c \

+		iem_route.c \

+		iem_sel_any.c \

+		iem_send_kernel.c \

+		init.c \

+		list2send.c \

+		mergefilename.c \

+		modulo_counter.c \

+		post_netreceive.c \

+		pre_inlet.c \

+		prepend_ascii.c \

+		round_zero.c \

+		sigfade.c \

+		sigiem_blocksize.c \

+		sigiem_samplerate.c \

+		sigLFO_noise.c \

+		sigm2f.c \

+		speedlim.c \

+		splitfilename.c \

+		stripfilename.c \

+		toggle_mess.c \

+		transf_fader.c \

+		unsymbol.c \

+		wrap.c \

+		iemlib2.c

+

+

+OBJ = $(SRC:.c=.obj)

+

+.c.obj:

+	cl $(PD_WIN_C_FLAGS) $(PD_WIN_INCLUDE_PATH) /c $*.c

+

+..\..\lib\iemlib2.dll: $(OBJ)

+	link $(PD_WIN_L_FLAGS) /dll /export:iemlib2_setup \

+	/out:..\..\lib\iemlib2.dll $(OBJ) $(PD_WIN_LIB)

+

+clean:

+	del *.obj