From be3defac043d4453ad3130bd5f990b50b1614468 Mon Sep 17 00:00:00 2001 From: musil Date: Thu, 7 Jul 2011 13:18:12 +0000 Subject: removed iemlib2.dsp and dsw, changed to correct makefile_win, added iem_atan2.dsw and dsp svn path=/trunk/externals/iemlib/; revision=15144 --- iemlib2/src/VC6/iem_atan2.dsp | 85 +++++++++++++++++++++++++++++++++++++++++++ iemlib2/src/VC6/iem_atan2.dsw | 29 +++++++++++++++ iemlib2/src/VC6/iemlib2.dsp | 85 ------------------------------------------- iemlib2/src/VC6/iemlib2.dsw | 29 --------------- iemlib2/src/VC6/makefile_win | 60 +++++++----------------------- 5 files changed, 127 insertions(+), 161 deletions(-) create mode 100644 iemlib2/src/VC6/iem_atan2.dsp create mode 100644 iemlib2/src/VC6/iem_atan2.dsw delete mode 100644 iemlib2/src/VC6/iemlib2.dsp delete mode 100644 iemlib2/src/VC6/iemlib2.dsw (limited to 'iemlib2/src') diff --git a/iemlib2/src/VC6/iem_atan2.dsp b/iemlib2/src/VC6/iem_atan2.dsp new file mode 100644 index 0000000..a6ac17d --- /dev/null +++ b/iemlib2/src/VC6/iem_atan2.dsp @@ -0,0 +1,85 @@ +# Microsoft Developer Studio Project File - Name="iem_atan2" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** NICHT BEARBEITEN ** + +# TARGTYPE "Win32 (x86) External Target" 0x0106 + +CFG=iem_atan2 - 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_atan2.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_atan2.mak" CFG="iem_atan2 - Win32 Debug" +!MESSAGE +!MESSAGE Für die Konfiguration stehen zur Auswahl: +!MESSAGE +!MESSAGE "iem_atan2 - Win32 Release" (basierend auf "Win32 (x86) External Target") +!MESSAGE "iem_atan2 - Win32 Debug" (basierend auf "Win32 (x86) External Target") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" + +!IF "$(CFG)" == "iem_atan2 - 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_atan2.exe" +# PROP Bsc_Name "iem_atan2.bsc" +# PROP Target_Dir "" + +!ELSEIF "$(CFG)" == "iem_atan2 - 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_atan2.exe" +# PROP Bsc_Name "iem_atan2.bsc" +# PROP Target_Dir "" + +!ENDIF + +# Begin Target + +# Name "iem_atan2 - Win32 Release" +# Name "iem_atan2 - Win32 Debug" + +!IF "$(CFG)" == "iem_atan2 - Win32 Release" + +!ELSEIF "$(CFG)" == "iem_atan2 - Win32 Debug" + +!ENDIF + +# Begin Source File + +SOURCE=.\makefile_win +# End Source File +# End Target +# End Project diff --git a/iemlib2/src/VC6/iem_atan2.dsw b/iemlib2/src/VC6/iem_atan2.dsw new file mode 100644 index 0000000..a0317cb --- /dev/null +++ b/iemlib2/src/VC6/iem_atan2.dsw @@ -0,0 +1,29 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNUNG: DIESE ARBEITSBEREICHSDATEI DARF NICHT BEARBEITET ODER GELÖSCHT WERDEN! + +############################################################################### + +Project: "iem_atan2"=.\iem_atan2.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff --git a/iemlib2/src/VC6/iemlib2.dsp b/iemlib2/src/VC6/iemlib2.dsp deleted file mode 100644 index 0eee8d0..0000000 --- a/iemlib2/src/VC6/iemlib2.dsp +++ /dev/null @@ -1,85 +0,0 @@ -# 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/iemlib2/src/VC6/iemlib2.dsw b/iemlib2/src/VC6/iemlib2.dsw deleted file mode 100644 index 4cf6c56..0000000 --- a/iemlib2/src/VC6/iemlib2.dsw +++ /dev/null @@ -1,29 +0,0 @@ -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/iemlib2/src/VC6/makefile_win b/iemlib2/src/VC6/makefile_win index fe2a0ac..1f2d144 100644 --- a/iemlib2/src/VC6/makefile_win +++ b/iemlib2/src/VC6/makefile_win @@ -1,10 +1,14 @@ -TARGET = iemlib2 -all: ..\$(TARGET).dll + +all: ..\iem_atan2.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 /DHAVE_G_CANVAS_H /Ox -DPA_LITTLE_ENDIAN + +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 \ @@ -16,56 +20,18 @@ PD_WIN_LIB = /NODEFAULTLIB:libc /NODEFAULTLIB:oldnames /NODEFAULTLIB:kernel /NOD $(PD_INST_PATH)\bin\pthreadVC.lib \ $(PD_INST_PATH)\bin\pd.lib -SRC = add2_comma.c \ - aspeedlim.c \ - bpe.c \ - dollarg.c \ - exp_inc.c \ - fade~.c \ - float24.c \ - iem_alisttosym.c \ - iem_anything.c \ - iem_append.c \ - iem_blocksize~.c \ - iem_i_route.c \ - iem_pbank_csv.c \ - iem_prepend.c \ - iem_receive.c \ - iem_route.c \ - iem_samplerate~.c \ - iem_sel_any.c \ - iem_send.c \ - iem_symtoalist.c \ - init.c \ - LFO_noise~.c \ - list2send.c \ - m2f~.c \ - mergefilename.c \ - modulo_counter.c \ - parentdollarzero.c \ - post_netreceive.c \ - pre_inlet.c \ - prepend_ascii.c \ - protect_against_open.c \ - receive2list.c \ - round_zero.c \ - speedlim.c \ - splitfilename.c \ - stripfilename.c \ - toggle_mess.c \ - transf_fader.c \ - unsymbol.c \ - wrap.c \ - $(TARGET).c + +SRC = iem_atan2.c + OBJ = $(SRC:.c=.obj) .c.obj: cl $(PD_WIN_C_FLAGS) $(PD_WIN_INCLUDE_PATH) /c $*.c -..\$(TARGET).dll: $(OBJ) - link $(PD_WIN_L_FLAGS) /dll /export:$(TARGET)_setup \ - /out:..\$(TARGET).dll $(OBJ) $(PD_WIN_LIB) +..\iem_atan2.dll: $(OBJ) + link $(PD_WIN_L_FLAGS) /dll /export:iem_atan2_setup \ + /out:..\iem_atan2.dll $(OBJ) $(PD_WIN_LIB) clean: del *.obj -- cgit v1.2.1