removed iemlib2.dsp and dsw, changed to correct makefile_win, added iem_atan2.dsw and dsp

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

3 files changed, 30 insertions, 64 deletions

diff --git a/iemlib2/src/VC6/iemlib2.dsp b/iemlib2/src/VC6/iem_atan2.dsp
index 0eee8d0..a6ac17d 100644
--- a/iemlib2/src/VC6/iemlib2.dsp
+++ b/iemlib2/src/VC6/iem_atan2.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="iemlib2" - Package Owner=<4>

+# 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=iemlib2 - Win32 Debug

+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 "iemlib2.mak".

+!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 "iemlib2.mak" CFG="iemlib2 - Win32 Debug"

+!MESSAGE NMAKE /f "iem_atan2.mak" CFG="iem_atan2 - 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 "iem_atan2 - Win32 Release" (basierend auf  "Win32 (x86) External Target")

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

 !MESSAGE 

 

 # Begin Project

@@ -26,7 +26,7 @@ CFG=iemlib2 - Win32 Debug
 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

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

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

 

 # PROP BASE Use_Debug_Libraries 0

 # PROP BASE Output_Dir "Release"

@@ -41,11 +41,11 @@ CFG=iemlib2 - Win32 Debug
 # 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_File "iem_atan2.exe"

+# PROP Bsc_Name "iem_atan2.bsc"

 # PROP Target_Dir ""

 

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

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

 

 # PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "Debug"

@@ -60,20 +60,20 @@ CFG=iemlib2 - Win32 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_File "iem_atan2.exe"

+# PROP Bsc_Name "iem_atan2.bsc"

 # PROP Target_Dir ""

 

 !ENDIF 

 

 # Begin Target

 

-# Name "iemlib2 - Win32 Release"

-# Name "iemlib2 - Win32 Debug"

+# Name "iem_atan2 - Win32 Release"

+# Name "iem_atan2 - Win32 Debug"

 

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

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

 

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

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

 

 !ENDIF 

 

diff --git a/iemlib2/src/VC6/iemlib2.dsw b/iemlib2/src/VC6/iem_atan2.dsw
index 4cf6c56..a0317cb 100644
--- a/iemlib2/src/VC6/iemlib2.dsw
+++ b/iemlib2/src/VC6/iem_atan2.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

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

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

 

 Package=<5>

 {{{

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