jackaudio
/
jack2
mirror of https://github.com/jackaudio/jack2
1
0
Fork 0
Code Releases 45 Activity
Browse Source

Peter L Jones patch for NetJack1 compilation on Windows. 

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3827 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/v1.9.5
sletz 16 years ago
parent
7903f675ee
commit
dab4e3446e
9 changed files with 326 additions and 3 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +6
    -1
      ChangeLog
  2. +1
    -0
      common/netjack_packet.c
  3. +1
    -0
      example-clients/netsource.c
  4. +1
    -1
      windows/jack_disconnect.cbp
  5. +107
    -0
      windows/jack_netonedriver.cbp
  6. +113
    -0
      windows/jack_netsource.cbp
  7. +48
    -0
      windows/jack_netsource.rc
  8. +8
    -1
      windows/jackd.workspace
  9. +41
    -0
      windows/jacknetonedriver.rc

+ 6
- 1
ChangeLog View File

@@ -19,12 +19,17 @@ Romain Moret
Florian Faber
Michael Voigt
Torben Hohn
Paul Davis
Paul Davis
Peter L Jones
---------------------------
Jackdmp changes log
---------------------------

2009-11-23 Stephane Letz <letz@grame.fr>
* Peter L Jones patch for NetJack1 compilation on Windows.

2009-11-20 Stephane Letz <letz@grame.fr>
* Version 1.9.5 started.


+ 1
- 0
common/netjack_packet.c View File

@@ -50,6 +50,7 @@

#ifdef WIN32
#include <winsock2.h>
#define socklen_t int
#include <malloc.h>
#else
#include <sys/socket.h>


+ 1
- 0
example-clients/netsource.c View File

@@ -36,6 +36,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

#ifdef WIN32
#include <winsock2.h>
#define socklen_t int
#include <malloc.h>
#else
#include <netinet/in.h>


+ 1
- 1
windows/jack_disconnect.cbp View File

@@ -37,7 +37,7 @@
<Add directory="..\common" />
</Compiler>
<Linker>
<Add directory="Release\bin" />
<Add directory="Debug\bin" />
</Linker>
</Target>
<Target title="Win32 Profiling">


+ 107
- 0
windows/jack_netonedriver.cbp View File

@@ -0,0 +1,107 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_project_file>
<FileVersion major="1" minor="6" />
<Project>
<Option title="jack_netonedriver" />
<Option pch_mode="2" />
<Option compiler="gcc" />
<Build>
<Target title="Win32 Release">
<Option output="Release\bin\jack\jack_netone" prefix_auto="1" extension_auto="1" />
<Option object_output="Release\" />
<Option type="3" />
<Option compiler="gcc" />
<Compiler>
<Add option="-O2" />
<Add option="-Wall" />
<Add option="-DBUILD_DLL" />
<Add option="-DSERVER_SIDE" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
</Compiler>
<Linker>
<Add directory="Release\bin" />
</Linker>
</Target>
<Target title="Win32 Debug">
<Option output="Debug\bin\jack\jack_netone" prefix_auto="1" extension_auto="1" />
<Option object_output="Debug\" />
<Option type="3" />
<Option compiler="gcc" />
<Compiler>
<Add option="-Wall" />
<Add option="-g" />
<Add option="-DBUILD_DLL" />
<Add option="-DSERVER_SIDE" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
</Compiler>
<Linker>
<Add directory="Debug\bin" />
</Linker>
</Target>
<Target title="Win32 Profiling">
<Option output="Release\bin\jack\jack_netone" prefix_auto="1" extension_auto="1" />
<Option object_output="Release\" />
<Option type="3" />
<Option compiler="gcc" />
<Compiler>
<Add option="-O2" />
<Add option="-Wall" />
<Add option="-DBUILD_DLL" />
<Add option="-DJACK_MONITOR" />
<Add option="-DSERVER_SIDE" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
</Compiler>
<Linker>
<Add directory="Release\bin" />
</Linker>
</Target>
</Build>
<Compiler>
<Add option="-Wall" />
</Compiler>
<Linker>
<Add option="-enable-auto-import" />
<Add library="kernel32" />
<Add library="user32" />
<Add library="gdi32" />
<Add library="winspool" />
<Add library="comdlg32" />
<Add library="advapi32" />
<Add library="shell32" />
<Add library="ole32" />
<Add library="oleaut32" />
<Add library="uuid" />
<Add library="odbc32" />
<Add library="odbccp32" />
<Add library="libjackserver" />
<Add library="ws2_32" />
</Linker>
<Unit filename="..\common\JackNetOneDriver.cpp" />
<Unit filename="..\common\netjack.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\common\netjack_packet.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="jacknetonedriver.rc">
<Option compilerVar="WINDRES" />
</Unit>
<Extensions>
<code_completion />
<envvars />
<debugger />
<lib_finder disable_auto="1" />
<AutoVersioning>
<Scheme minor_max="10" build_max="0" rev_max="0" rev_rand_max="10" build_times_to_increment_minor="100" />
<Settings autoincrement="1" date_declarations="1" do_auto_increment="0" ask_to_increment="0" language="C++" svn="0" svn_directory="" header_path="version.h" />
<Changes_Log show_changes_editor="0" app_title="released version %M.%m.%b of %p" changeslog_path="ChangesLog.txt" />
</AutoVersioning>
</Extensions>
</Project>
</CodeBlocks_project_file>

+ 113
- 0
windows/jack_netsource.cbp View File

@@ -0,0 +1,113 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_project_file>
<FileVersion major="1" minor="6" />
<Project>
<Option title="jack_netsource" />
<Option pch_mode="2" />
<Option compiler="gcc" />
<Build>
<Target title="Win32 Release">
<Option output="Release\bin\jack_netsource" prefix_auto="1" extension_auto="1" />
<Option object_output="Release\" />
<Option type="1" />
<Option compiler="gcc" />
<Compiler>
<Add option="-O2" />
<Add option="-Wall" />
<Add directory="..\example-clients" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
</Compiler>
<Linker>
<Add directory="Release\bin" />
</Linker>
</Target>
<Target title="Win32 Debug">
<Option output="Debug\bin\jack_netsource" prefix_auto="1" extension_auto="1" />
<Option object_output="Debug\" />
<Option type="1" />
<Option compiler="gcc" />
<Compiler>
<Add option="-Wall" />
<Add option="-g" />
<Add directory="..\example-clients" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
</Compiler>
<Linker>
<Add directory="Debug\bin" />
</Linker>
</Target>
<Target title="Win32 Profiling">
<Option output="Release\bin\jack_netsource" prefix_auto="1" extension_auto="1" />
<Option object_output="Release\" />
<Option type="1" />
<Option compiler="gcc" />
<Compiler>
<Add option="-O2" />
<Add option="-Wall" />
<Add option="-DJACK_MONITOR" />
<Add directory="..\example-clients" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
</Compiler>
<Linker>
<Add directory="Release\bin" />
</Linker>
</Target>
</Build>
<Compiler>
<Add option="-Wall" />
<Add directory="..\example-clients" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
</Compiler>
<Linker>
<Add library="kernel32" />
<Add library="user32" />
<Add library="gdi32" />
<Add library="winspool" />
<Add library="comdlg32" />
<Add library="advapi32" />
<Add library="shell32" />
<Add library="ole32" />
<Add library="oleaut32" />
<Add library="uuid" />
<Add library="odbc32" />
<Add library="odbccp32" />
<Add library="libjack" />
<Add library="libsamplerate-0" />
<Add library="ws2_32" />
<Add directory="Release\bin" />
</Linker>
<Unit filename="..\common\netjack_packet.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\example-clients\netsource.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="getopt.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="getopt1.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="jack_netsource.rc">
<Option compilerVar="WINDRES" />
</Unit>
<Extensions>
<code_completion />
<envvars />
<debugger />
<AutoVersioning>
<Scheme minor_max="10" build_max="0" rev_max="0" rev_rand_max="10" build_times_to_increment_minor="100" />
<Settings autoincrement="1" date_declarations="1" do_auto_increment="0" ask_to_increment="0" language="C++" svn="0" svn_directory="" header_path="version.h" />
<Changes_Log show_changes_editor="0" app_title="released version %M.%m.%b of %p" changeslog_path="ChangesLog.txt" />
</AutoVersioning>
</Extensions>
</Project>
</CodeBlocks_project_file>

+ 48
- 0
windows/jack_netsource.rc View File

@@ -0,0 +1,48 @@
// Generated by ResEdit 1.4.3
// Copyright (C) 2006-2008
// http://www.resedit.net

#include "resource.h"
#include "afxres.h"


//
// Version Information resources
//
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
1 VERSIONINFO
FILEVERSION 1,9,5,0
PRODUCTVERSION 1,9,5,0
FILEOS VOS_UNKNOWN
FILETYPE VFT_APP
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040c04b0"
BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Grame\0"
VALUE "FileDescription", "JackNetOne netsource for Windows\0"
VALUE "FileVersion", "1, 9, 5, 0\0"
VALUE "InternalName", "netsource\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2009\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "jack_netsource.exe\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "jack_netsource\0"
VALUE "ProductVersion", "1, 9, 5, 0\0"
VALUE "SpecialBuild", "\0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 1036, 1200
END
END


//
// Icon resources
//
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
IDI_ICON1 ICON ".\\Setup\\src\\jack.ico"

+ 8
- 1
windows/jackd.workspace View File

@@ -11,6 +11,9 @@
<Project filename="jack_netdriver.cbp">
<Depends filename="libjackserver.cbp" />
</Project>
<Project filename="jack_netonedriver.cbp">
<Depends filename="libjackserver.cbp" />
</Project>
<Project filename="jack_dummy.cbp">
<Depends filename="libjackserver.cbp" />
</Project>
@@ -33,6 +36,10 @@
<Project filename="jack_lsp.cbp">
<Depends filename="libjack.cbp" />
</Project>
<Project filename="jack_netsource.cbp" active="1">
<Depends filename="libjack.cbp" />
<Depends filename="jack_netonedriver.cbp" />
</Project>
<Project filename="jack_metro.cbp">
<Depends filename="libjack.cbp" />
</Project>
@@ -47,6 +54,6 @@
<Depends filename="libjack.cbp" />
</Project>
<Project filename="jack_winmme.cbp" />
<Project filename="jack_loopback.cbp" active="1" />
<Project filename="jack_loopback.cbp" />
</Workspace>
</CodeBlocks_workspace_file>

+ 41
- 0
windows/jacknetonedriver.rc View File

@@ -0,0 +1,41 @@
// Generated by ResEdit 1.4.3
// Copyright (C) 2006-2008
// http://www.resedit.net

#include "resource.h"
#include "afxres.h"


//
// Version Information resources
//
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
1 VERSIONINFO
FILEVERSION 1,9,5,0
PRODUCTVERSION 1,9,5,0
FILEOS VOS_UNKNOWN
FILETYPE VFT_DLL
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040c04b0"
BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Grame\0"
VALUE "FileDescription", "Jackmp NetOne Driver for Windows\0"
VALUE "FileVersion", "1, 9, 5, 0\0"
VALUE "InternalName", "jack_netonedriver\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2009\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "jack_netonedriver.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "jack_netonedriver\0"
VALUE "ProductVersion", "1, 9, 5, 0\0"
VALUE "SpecialBuild", "\0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 1036, 1200
END
END

Write Preview
Loading…
Cancel
Save