From 8724ea74a1936886a6507bfa2d8989d82bf066bf Mon Sep 17 00:00:00 2001 From: musil Date: Wed, 9 Mar 2005 17:16:00 +0000 Subject: sync with last iem 1.15 ! svn path=/trunk/externals/iemlib/; revision=2611 --- src/iem_mp3/iem_mp3.dsp | 170 +++++++++++++++++++++++------------------------ src/iem_mp3/iem_mp3.dsw | 58 ++++++++-------- src/iem_mp3/makefile | 4 +- src/iem_mp3/makefile_win | 76 ++++++++++----------- 4 files changed, 154 insertions(+), 154 deletions(-) (limited to 'src/iem_mp3') diff --git a/src/iem_mp3/iem_mp3.dsp b/src/iem_mp3/iem_mp3.dsp index 9fe129d..796189b 100644 --- a/src/iem_mp3/iem_mp3.dsp +++ b/src/iem_mp3/iem_mp3.dsp @@ -1,85 +1,85 @@ -# Microsoft Developer Studio Project File - Name="iem_mp3" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** NICHT BEARBEITEN ** - -# TARGTYPE "Win32 (x86) External Target" 0x0106 - -CFG=iem_mp3 - 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 "iem_mp3.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 "iem_mp3.mak" CFG="iem_mp3 - Win32 Debug" -!MESSAGE -!MESSAGE Für die Konfiguration stehen zur Auswahl: -!MESSAGE -!MESSAGE "iem_mp3 - Win32 Release" (basierend auf "Win32 (x86) External Target") -!MESSAGE "iem_mp3 - Win32 Debug" (basierend auf "Win32 (x86) External Target") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" - -!IF "$(CFG)" == "iem_mp3 - 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 "iem_mp3.exe" -# PROP Bsc_Name "iem_mp3.bsc" -# PROP Target_Dir "" - -!ELSEIF "$(CFG)" == "iem_mp3 - 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 "iem_mp3.exe" -# PROP Bsc_Name "iem_mp3.bsc" -# PROP Target_Dir "" - -!ENDIF - -# Begin Target - -# Name "iem_mp3 - Win32 Release" -# Name "iem_mp3 - Win32 Debug" - -!IF "$(CFG)" == "iem_mp3 - Win32 Release" - -!ELSEIF "$(CFG)" == "iem_mp3 - Win32 Debug" - -!ENDIF - -# Begin Source File - -SOURCE=.\makefile_win -# End Source File -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="iem_mp3" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** NICHT BEARBEITEN ** + +# TARGTYPE "Win32 (x86) External Target" 0x0106 + +CFG=iem_mp3 - 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 "iem_mp3.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 "iem_mp3.mak" CFG="iem_mp3 - Win32 Debug" +!MESSAGE +!MESSAGE Für die Konfiguration stehen zur Auswahl: +!MESSAGE +!MESSAGE "iem_mp3 - Win32 Release" (basierend auf "Win32 (x86) External Target") +!MESSAGE "iem_mp3 - Win32 Debug" (basierend auf "Win32 (x86) External Target") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" + +!IF "$(CFG)" == "iem_mp3 - 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 "iem_mp3.exe" +# PROP Bsc_Name "iem_mp3.bsc" +# PROP Target_Dir "" + +!ELSEIF "$(CFG)" == "iem_mp3 - 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 "iem_mp3.exe" +# PROP Bsc_Name "iem_mp3.bsc" +# PROP Target_Dir "" + +!ENDIF + +# Begin Target + +# Name "iem_mp3 - Win32 Release" +# Name "iem_mp3 - Win32 Debug" + +!IF "$(CFG)" == "iem_mp3 - Win32 Release" + +!ELSEIF "$(CFG)" == "iem_mp3 - Win32 Debug" + +!ENDIF + +# Begin Source File + +SOURCE=.\makefile_win +# End Source File +# End Target +# End Project diff --git a/src/iem_mp3/iem_mp3.dsw b/src/iem_mp3/iem_mp3.dsw index f352ffa..f885c80 100644 --- a/src/iem_mp3/iem_mp3.dsw +++ b/src/iem_mp3/iem_mp3.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: "iem_mp3"=.\iem_mp3.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: "iem_mp3"=.\iem_mp3.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff --git a/src/iem_mp3/makefile b/src/iem_mp3/makefile index 601a96f..9994415 100644 --- a/src/iem_mp3/makefile +++ b/src/iem_mp3/makefile @@ -2,14 +2,14 @@ current: all .SUFFIXES: .pd_linux -INCLUDE = -I. -I/usr/local/src/pd-0.36-0/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/iem_mp3/makefile_win b/src/iem_mp3/makefile_win index d6b7fa1..71ab182 100644 --- a/src/iem_mp3/makefile_win +++ b/src/iem_mp3/makefile_win @@ -1,38 +1,38 @@ - -all: ..\..\lib\iem_mp3.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 = sigmp3play.c \ - iem_mp3.c - - -OBJ = $(SRC:.c=.obj) - -.c.obj: - cl $(PD_WIN_C_FLAGS) $(PD_WIN_INCLUDE_PATH) /c $*.c - -..\..\lib\iem_mp3.dll: $(OBJ) - link $(PD_WIN_L_FLAGS) /dll /export:iem_mp3_setup \ - /out:..\..\lib\iem_mp3.dll $(OBJ) $(PD_WIN_LIB) - -clean: - del *.obj + +all: ..\..\lib\iem_mp3.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 = sigmp3play.c \ + iem_mp3.c + + +OBJ = $(SRC:.c=.obj) + +.c.obj: + cl $(PD_WIN_C_FLAGS) $(PD_WIN_INCLUDE_PATH) /c $*.c + +..\..\lib\iem_mp3.dll: $(OBJ) + link $(PD_WIN_L_FLAGS) /dll /export:iem_mp3_setup \ + /out:..\..\lib\iem_mp3.dll $(OBJ) $(PD_WIN_LIB) + +clean: + del *.obj -- cgit v1.2.1