Windows version

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1901 0c269be4-1314-0410-8aa9-9f06e86f4224

common/JackTypes.h

@@ -32,13 +32,13 @@ typedef signed long   SInt32;
 
 #ifdef WIN32
 #include <windows.h>
-typedef ULONGLONG UInt64;
-#else
+typedef ULONGLONG UInt64;
+typedef unsigned short uint16_t;
+#else
+#include <stdint.h>
 typedef unsigned long long UInt64;
 #endif
 
-#include <stdint.h>
-
 typedef uint16_t jack_int_t;  // Internal type for ports and refnum
 
 namespace Jack

windows/jack_portaudio.dsp

@@ -113,27 +113,27 @@ SOURCE=.\portaudio.lib
 # End Source File
 # Begin Source File
 
-SOURCE=.\Release\libjackdmp.lib
+SOURCE=.\Debug\libjackservermp_debug.lib
 
 !IF  "$(CFG)" == "jack_portaudio - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "jack_portaudio - Win32 Debug"
-
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "jack_portaudio - Win32 Debug"
+
 !ENDIF 
 
 # End Source File
 # Begin Source File
 
-SOURCE=.\Debug\libjackdmp_debug.lib
+SOURCE=.\Release\libjackservermp.lib
 
 !IF  "$(CFG)" == "jack_portaudio - Win32 Release"
 
-# PROP Exclude_From_Build 1
-
 !ELSEIF  "$(CFG)" == "jack_portaudio - Win32 Debug"
 
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File

windows/jackdmp.dsp

@@ -108,7 +108,7 @@ SOURCE=.\JackdmpWIN32.cpp
 # End Group
 # Begin Source File
 
-SOURCE=.\Release\libjackdmp.lib
+SOURCE=.\Release\libjackservermp.lib
 
 !IF  "$(CFG)" == "jackdmp - Win32 Release"
 
@@ -121,7 +121,7 @@ SOURCE=.\Release\libjackdmp.lib
 # End Source File
 # Begin Source File
 
-SOURCE=.\Debug\libjackdmp_debug.lib
+SOURCE=.\Debug\libjackservermp_debug.lib
 
 !IF  "$(CFG)" == "jackdmp - Win32 Release"
 

windows/jackdmp.dsw

@@ -99,7 +99,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "jdelay"=".\jdelay\jdelay.dsp" - Package Owner=<4>
+Project: "jdelay"="..\..\..\..\Jackdmp\src_win32\windows\jdelay.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -111,7 +111,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "libjackdmp"=".\libjackdmp.dsp" - Package Owner=<4>
+Project: "libjackmp"=".\libjackmp.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -123,7 +123,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "libjackmp"=".\libjackmp.dsp" - Package Owner=<4>
+Project: "libjackservermp"=".\libjackservermp.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{

windows/libjackdmp.dsp → windows/libjackservermp.dsp

@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="libjackdmp" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="libjackservermp" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=libjackdmp - Win32 Debug
+CFG=libjackservermp - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "libjackdmp.mak".
+!MESSAGE NMAKE /f "libjackservermp.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "libjackdmp.mak" CFG="libjackdmp - Win32 Debug"
+!MESSAGE NMAKE /f "libjackservermp.mak" CFG="libjackservermp - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "libjackdmp - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "libjackdmp - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libjackservermp - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libjackservermp - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "libjackdmp - Win32 Release"
+!IF  "$(CFG)" == "libjackservermp - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -54,7 +54,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
 
-!ELSEIF  "$(CFG)" == "libjackdmp - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libjackservermp - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -78,14 +78,14 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"Debug/libjackdmp_debug.dll" /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"Debug/libjackservermp_debug.dll" /pdbtype:sept
 
 !ENDIF 
 
 # Begin Target
 
-# Name "libjackdmp - Win32 Release"
-# Name "libjackdmp - Win32 Debug"
+# Name "libjackservermp - Win32 Release"
+# Name "libjackservermp - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"