Commit 40a63dc7 authored by sletz's avatar sletz
Browse files

On Windows, change PortAudio and LibSamplerate libraries to static ones.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4745 0c269be4-1314-0410-8aa9-9f06e86f4224
parent 85334f7d
......@@ -23,7 +23,8 @@
#include "JackCompilerDeps.h"
#include "JackException.h"
#include <windows.h>
#include <windows.h>
#include <stdio.h>
namespace Jack
{
......
......@@ -69,8 +69,6 @@
<_><src>..\Release\bin\jackd.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release\bin\libjack.dll</><dest>sys</><custom></><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release\bin\libjackserver.dll</><dest>sys</><custom></><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release\bin\libsamplerate_x86.dll</><dest>sys</><custom></><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release\bin\portaudio_x86.dll</><dest>sys</><custom></><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release\bin\jack\jack_net.dll</><dest>sys</><custom>jack</><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release\bin\jack\jack_netone.dll</><dest>sys</><custom>jack</><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release\bin\jack_netsource.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
......@@ -99,7 +97,6 @@
<_><src>.\src\32bits\JackRouter.ini</><dest>inst</><custom>32bits</><ifexist>overnewer</><recurs>0</></>
<_><src>.\src\32bits\msvcr100.dll</><dest>inst</><custom>32bits</><ifexist>overnewer</><recurs>0</></>
<_><src>.\src\32bits\msvcp100.dll</><dest>inst</><custom>32bits</><ifexist>overnewer</><recurs>0</></>
<_><src>.\src\32bits\portaudio_x86.lib</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
<_><src>.\qjackctl\mingwm10.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
<_><src>.\qjackctl\qjackctl.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
<_><src>.\qjackctl\QtCore4.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
......
......@@ -69,7 +69,6 @@
<_><src>..\Release\bin\libjackserver.lib</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release\bin\libjackserver.def</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release\bin\libjackserver.dll</><dest>sys</><custom></><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release\bin\portaudio_x86.dll</><dest>sys</><custom></><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release64\bin\jack_connect.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release64\bin\jack_disconnect.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release64\bin\jack_load.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
......@@ -78,8 +77,6 @@
<_><src>..\Release64\bin\jack_unload.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release64\bin\jack_midi_latency_test.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release64\bin\jackd.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release64\bin\libsamplerate_x86_64.dll</><dest>win</><custom></><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release64\bin\portaudio_x86_64.dll</><dest>win</><custom></><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release64\bin\jack\jack_net.dll</><dest>win</><custom>jack</><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release64\bin\jack\jack_netone.dll</><dest>win</><custom>jack</><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release64\bin\jack_netsource.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
......@@ -112,7 +109,6 @@
<_><src>.\src\64bits\JackRouter.ini</><dest>inst</><custom>64bits</><ifexist>overnewer</><recurs>0</></>
<_><src>.\src\64bits\msvcr100.dll</><dest>inst</><custom>64bits</><ifexist>overnewer</><recurs>0</></>
<_><src>.\src\64bits\msvcp100.dll</><dest>inst</><custom>64bits</><ifexist>overnewer</><recurs>0</></>
<_><src>.\src\64bits\portaudio_x86_64.lib</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
<_><src>.\qjackctl\mingwm10.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
<_><src>.\qjackctl\qjackctl.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
<_><src>.\qjackctl\QtCore4.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
......
......@@ -17,16 +17,18 @@
<Add option="-DBUILD_DLL" />
<Add option="-D__SMP__" />
<Add option="-DSERVER_SIDE" />
<Add option="-DJACK_32_64" />
<Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
<Add directory="portaudio" />
</Compiler>
<Linker>
<Add library="libsamplerate_x86_64" />
<Add library="libjackserver64" />
<Add library="portaudio_x86_64" />
<Add library="libportaudio_x86_64.a" />
<Add library="libsamplerate_x86_64.a" />
<Add library="winmm" />
<Add library="ole32" />
<Add directory="Release64\bin" />
</Linker>
</Target>
......@@ -41,16 +43,16 @@
<Add option="-DBUILD_DLL" />
<Add option="-D__SMP__" />
<Add option="-DSERVER_SIDE" />
<Add option="-DJACK_32_64" />
<Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
<Add directory="portaudio" />
</Compiler>
<Linker>
<Add library="libsamplerate_x86_64" />
<Add library="libjackserver64" />
<Add library="portaudio_x86_64" />
<Add library="libportaudio_x86_64.a" />
<Add library="libsamplerate_x86_64.a" />
<Add directory="Debug64\bin" />
</Linker>
</Target>
......@@ -66,16 +68,16 @@
<Add option="-D__SMP__" />
<Add option="-DJACK_MONITOR" />
<Add option="-DSERVER_SIDE" />
<Add option="-DJACK_32_64" />
<Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
<Add directory="portaudio" />
</Compiler>
<Linker>
<Add library="libsamplerate_x86_64" />
<Add library="libjackserver64" />
<Add library="portaudio_x86_64" />
<Add library="libportaudio_x86_64.a" />
<Add library="libsamplerate_x86_64.a" />
<Add directory="Release64\bin" />
</Linker>
</Target>
......@@ -91,7 +93,7 @@
<Add option="-DBUILD_DLL" />
<Add option="-D__SMP__" />
<Add option="-DSERVER_SIDE" />
<Add option="-DJACK_32_64" />
<Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
......@@ -99,9 +101,11 @@
</Compiler>
<Linker>
<Add option="-m32" />
<Add library="libsamplerate_x86" />
<Add library="libjackserver" />
<Add library="portaudio_x86" />
<Add library="libportaudio_x86.a" />
<Add library="libsamplerate_x86.a" />
<Add library="winmm" />
<Add library="ole32" />
<Add directory="Release\bin" />
</Linker>
<ExtraCommands>
......@@ -120,7 +124,7 @@
<Add option="-DBUILD_DLL" />
<Add option="-D__SMP__" />
<Add option="-DSERVER_SIDE" />
<Add option="-DJACK_32_64" />
<Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
......@@ -128,9 +132,9 @@
</Compiler>
<Linker>
<Add option="-m32" />
<Add library="libsamplerate_x86" />
<Add library="libjackserver" />
<Add library="portaudio_x86" />
<Add library="libportaudio_x86.a" />
<Add library="libsamplerate_x86.a" />
<Add directory="Debug\bin" />
</Linker>
<ExtraCommands>
......@@ -150,7 +154,7 @@
<Add option="-D__SMP__" />
<Add option="-DJACK_MONITOR" />
<Add option="-DSERVER_SIDE" />
<Add option="-DJACK_32_64" />
<Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
......@@ -158,9 +162,9 @@
</Compiler>
<Linker>
<Add option="-m32" />
<Add library="libsamplerate_x86" />
<Add library="libjackserver" />
<Add library="portaudio_x86" />
<Add library="libportaudio_x86.a" />
<Add library="libsamplerate_x86.a" />
<Add directory="Release\bin" />
</Linker>
<ExtraCommands>
......
......@@ -23,7 +23,7 @@
</Compiler>
<Linker>
<Add library="libjackserver64" />
<Add library="libsamplerate_x86_64" />
<Add library="libsamplerate_x86_64.a" />
<Add directory="Release64\bin" />
</Linker>
</Target>
......@@ -44,7 +44,7 @@
</Compiler>
<Linker>
<Add library="libjackserver64" />
<Add library="libsamplerate_x86_64" />
<Add library="libsamplerate_x86_64.a" />
<Add directory="Debug64\bin" />
</Linker>
</Target>
......@@ -66,7 +66,7 @@
</Compiler>
<Linker>
<Add library="libjackserver64" />
<Add library="libsamplerate_x86_64" />
<Add library="libsamplerate_x86_64.a" />
<Add directory="Release64\bin" />
</Linker>
</Target>
......@@ -89,7 +89,7 @@
<Linker>
<Add option="-m32" />
<Add library="libjackserver" />
<Add library="libsamplerate_x86" />
<Add library="libsamplerate_x86.a" />
<Add directory="Release\bin" />
</Linker>
<ExtraCommands>
......@@ -115,7 +115,7 @@
<Linker>
<Add option="-m32" />
<Add library="libjackserver" />
<Add library="libsamplerate_x86" />
<Add library="libsamplerate_x86.a" />
<Add directory="Debug\bin" />
</Linker>
<ExtraCommands>
......@@ -142,7 +142,7 @@
<Linker>
<Add option="-m32" />
<Add library="libjackserver" />
<Add library="libsamplerate_x86" />
<Add library="libsamplerate_x86.a" />
<Add directory="Release\bin" />
</Linker>
<ExtraCommands>
......
......@@ -30,7 +30,9 @@
</Compiler>
<Linker>
<Add library="libjackserver64" />
<Add library="portaudio_x86_64" />
<Add library="libportaudio_x86_64.a" />
<Add library="winmm" />
<Add library="ole32" />
<Add directory="..\windows" />
<Add directory="Release64\bin" />
</Linker>
......@@ -59,7 +61,7 @@
</Compiler>
<Linker>
<Add library="libjackserver64" />
<Add library="portaudio_x86_64" />
<Add library="libportaudio_x86_64.a" />
<Add directory="Debug64\bin" />
<Add directory="..\windows" />
</Linker>
......@@ -89,7 +91,7 @@
</Compiler>
<Linker>
<Add library="libjackserver64" />
<Add library="portaudio_x86_64" />
<Add library="libportaudio_x86_64.a" />
<Add directory="Release64\bin" />
<Add directory="..\windows" />
</Linker>
......@@ -120,7 +122,9 @@
<Linker>
<Add option="-m32" />
<Add library="libjackserver" />
<Add library="portaudio_x86" />
<Add library="libportaudio_x86.a" />
<Add library="winmm" />
<Add library="ole32" />
<Add directory="..\windows" />
<Add directory="Release\bin" />
</Linker>
......@@ -154,7 +158,7 @@
<Linker>
<Add option="-m32" />
<Add library="libjackserver" />
<Add library="portaudio_x86" />
<Add library="libportaudio_x86.a" />
<Add directory="Debug\bin" />
<Add directory="..\windows" />
</Linker>
......@@ -189,7 +193,7 @@
<Linker>
<Add option="-m32" />
<Add library="libjackserver" />
<Add library="portaudio_x86" />
<Add library="libportaudio_x86.a" />
<Add directory="Release\bin" />
<Add directory="..\windows" />
</Linker>
......
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_workspace_file>
<Workspace title="jack">
<Project filename="libjack.cbp" active="1" />
<Project filename="libjack.cbp" />
<Project filename="libjacknet.cbp" />
<Project filename="libjackserver.cbp" />
<Project filename="jack_portaudio.cbp" />
......@@ -23,7 +23,7 @@
<Project filename="jack_loopback.cbp" />
<Project filename="jackd.cbp" />
<Project filename="jack_midi_latency_test.cbp" />
<Project filename="jack_netadapter.cbp" />
<Project filename="jack_netadapter.cbp" active="1" />
<Project filename="jack_netsource.cbp" />
<Project filename="jack_midi_dump.cbp" />
</Workspace>
......
......@@ -32,7 +32,7 @@
<Add directory="..\common" />
</Compiler>
<Linker>
<Add library="libsamplerate_x86_64" />
<Add library="libsamplerate_x86_64.a" />
<Add directory="Release64\bin" />
</Linker>
</Target>
......@@ -62,7 +62,7 @@
<Add directory="..\common" />
</Compiler>
<Linker>
<Add library="libsamplerate_x86_64" />
<Add library="libsamplerate_x86_64.a" />
<Add directory="Debug64\bin" />
</Linker>
</Target>
......@@ -93,7 +93,7 @@
<Add directory="..\common" />
</Compiler>
<Linker>
<Add library="libsamplerate_x86_64" />
<Add library="libsamplerate_x86_64.a" />
<Add directory="Release64\bin" />
</Linker>
</Target>
......@@ -125,7 +125,7 @@
</Compiler>
<Linker>
<Add option="-m32" />
<Add library="libsamplerate_x86" />
<Add library="libsamplerate_x86.a" />
<Add directory="Release\bin" />
</Linker>
<ExtraCommands>
......@@ -160,7 +160,7 @@
</Compiler>
<Linker>
<Add option="-m32" />
<Add library="libsamplerate_x86" />
<Add library="libsamplerate_x86.a" />
<Add directory="Debug\bin" />
</Linker>
<ExtraCommands>
......@@ -196,7 +196,7 @@
</Compiler>
<Linker>
<Add option="-m32" />
<Add library="libsamplerate_x86" />
<Add library="libsamplerate_x86.a" />
<Add directory="Release\bin" />
</Linker>
<ExtraCommands>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment