Commit 819463b3 authored by sletz's avatar sletz
Browse files

Change libraries name on Windows, update installer.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2902 0c269be4-1314-0410-8aa9-9f06e86f4224
parent 4b49d63f
/*
Copyright (C) 2004-2006 Grame
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef __jack_systemdeps_h__
#define __jack_systemdeps_h__
#ifdef WIN32
#include <windows.h>
#ifdef __MINGW32__
#include <stdint.h>
#include <sys/types.h>
#else
#define __inline__ inline
#define vsnprintf _vsnprintf
#define snprintf _snprintf
typedef char int8_t;
typedef unsigned char uint8_t;
typedef short int16_t;
typedef unsigned short uint16_t;
typedef long int32_t;
typedef unsigned long uint32_t;
typedef LONGLONG int64_t;
typedef ULONGLONG uint64_t;
#endif
typedef HANDLE pthread_t;
typedef int64_t _jack_time_t;
#endif // WIN32 */
#if defined(__APPLE__) || defined(__linux__)
#include <inttypes.h>
#include <pthread.h>
#include <sys/types.h>
typedef uint64_t _jack_time_t;
#endif // __APPLE__ || __linux__ */
#endif
/*
Copyright (C) 2004-2006 Grame
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef __jack_systemdeps_h__
#define __jack_systemdeps_h__
#ifdef WIN32
#include <windows.h>
#ifdef __MINGW32__
#include <stdint.h>
#include <sys/types.h>
#else
#define __inline__ inline
#define vsnprintf _vsnprintf
#define snprintf _snprintf
typedef char int8_t;
typedef unsigned char uint8_t;
typedef short int16_t;
typedef unsigned short uint16_t;
typedef long int32_t;
typedef unsigned long uint32_t;
typedef LONGLONG int64_t;
typedef ULONGLONG uint64_t;
#endif
typedef HANDLE pthread_t;
typedef int64_t _jack_time_t;
#endif // WIN32 */
#if defined(__APPLE__) || defined(__linux__)
#include <inttypes.h>
#include <pthread.h>
#include <sys/types.h>
typedef uint64_t _jack_time_t;
#endif // __APPLE__ || __linux__ */
#endif
......@@ -53,10 +53,12 @@
<bgfoot> </>
<bgback> </>
<files listview >
<_><src>..\Release\bin\libjackmp.a</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release\bin\libjackmp.def</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release\bin\libjackservermp.a</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release\bin\libjackservermp.def</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release\bin\libjack.a</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release\bin\libjack.lib</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release\bin\libjack.def</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release\bin\libjackserver.a</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
<_><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\jack_connect.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release\bin\jack_disconnect.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release\bin\jack_load.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
......@@ -64,8 +66,8 @@
<_><src>..\Release\bin\jack_metro.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release\bin\jack_unload.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release\bin\jackd.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release\bin\libjackmp.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release\bin\libjackservermp.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release\bin\libjack.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release\bin\libjackserver.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release\bin\libsamplerate-0.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release\bin\portaudio_x86.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release\bin\jack\jack_net.dll</><dest>inst</><custom>jack</><ifexist>overnewer</><recurs>0</></>
......@@ -84,6 +86,7 @@
<_><src>..\..\common\jack\thread.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
<_><src>..\..\common\jack\transport.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
<_><src>..\..\common\jack\types.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
<_><src>..\..\common\jack\systemdeps.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>1</></>
<_><src>.\JackRouter.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
<_><src>.\JackRouter.ini</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
<_><src>.\qjackctl\mingwm10.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
......
......@@ -85,7 +85,7 @@
<Add library="odbc32" />
<Add library="odbccp32" />
<Add library="libsamplerate-0" />
<Add library="libjackservermp" />
<Add library="libjackserver" />
<Add library="portaudio_x86" />
</Linker>
<Unit filename="..\common\JackAudioAdapter.cpp" />
......
......@@ -75,7 +75,7 @@
<Add library="uuid" />
<Add library="odbc32" />
<Add library="odbccp32" />
<Add library="libjackmp" />
<Add library="libjack" />
</Linker>
<Unit filename="..\example-clients\connect.c">
<Option compilerVar="CC" />
......
......@@ -79,7 +79,7 @@
<Add library="uuid" />
<Add library="odbc32" />
<Add library="odbccp32" />
<Add library="libjackmp" />
<Add library="libjack" />
</Linker>
<Unit filename="..\example-clients\connect.c">
<Option compilerVar="CC" />
......
......@@ -78,7 +78,7 @@
<Add library="uuid" />
<Add library="odbc32" />
<Add library="odbccp32" />
<Add library="libjackservermp" />
<Add library="libjackserver" />
</Linker>
<Unit filename="..\common\JackDummyDriver.cpp" />
<Extensions>
......
......@@ -74,7 +74,7 @@
<Add library="uuid" />
<Add library="odbc32" />
<Add library="odbccp32" />
<Add library="libjackmp" />
<Add library="libjack" />
</Linker>
<Unit filename="..\example-clients\ipload.c">
<Option compilerVar="CC" />
......
......@@ -72,7 +72,7 @@
<Add library="uuid" />
<Add library="odbc32" />
<Add library="odbccp32" />
<Add library="libjackmp" />
<Add library="libjack" />
</Linker>
<Unit filename="..\example-clients\lsp.c">
<Option compilerVar="CC" />
......
......@@ -75,7 +75,7 @@
<Add library="uuid" />
<Add library="odbc32" />
<Add library="odbccp32" />
<Add library="libjackmp" />
<Add library="libjack" />
</Linker>
<Unit filename="..\example-clients\metro.c">
<Option compilerVar="CC" />
......
......@@ -82,7 +82,7 @@
<Add library="uuid" />
<Add library="odbc32" />
<Add library="odbccp32" />
<Add library="libjackservermp" />
<Add library="libjackserver" />
<Add library="libsamplerate-0" />
<Add directory="Release\bin" />
</Linker>
......
......@@ -79,7 +79,7 @@
<Add library="uuid" />
<Add library="odbc32" />
<Add library="odbccp32" />
<Add library="libjackservermp" />
<Add library="libjackserver" />
<Add library="ws2_32" />
</Linker>
<Unit filename="..\common\JackNetDriver.cpp" />
......
......@@ -77,7 +77,7 @@
<Add library="odbc32" />
<Add library="odbccp32" />
<Add library="ws2_32" />
<Add library="libjackservermp" />
<Add library="libjackserver" />
</Linker>
<Unit filename="..\common\JackNetManager.cpp" />
<Unit filename="jacknetmanager.rc">
......
......@@ -102,7 +102,7 @@
<Add library="uuid" />
<Add library="odbc32" />
<Add library="odbccp32" />
<Add library="libjackservermp" />
<Add library="libjackserver" />
<Add library="portaudio_x86" />
</Linker>
<Unit filename="jackportaudio.rc">
......
......@@ -72,7 +72,7 @@
<Add library="uuid" />
<Add library="odbc32" />
<Add library="odbccp32" />
<Add library="libjackmp" />
<Add library="libjack" />
</Linker>
<Unit filename="..\example-clients\ipunload.c">
<Option compilerVar="CC" />
......
......@@ -92,7 +92,7 @@
<Add library="uuid" />
<Add library="odbc32" />
<Add library="odbccp32" />
<Add library="libjackservermp" />
<Add library="libjackserver" />
</Linker>
<Unit filename="..\common\Jackdmp.cpp" />
<Unit filename="getopt.c">
......
......@@ -2,7 +2,7 @@
<CodeBlocks_workspace_file>
<Workspace title="jack">
<Project filename="libjackserver.cbp" />
<Project filename="jackd.cbp">
<Project filename="jackd.cbp" active="1">
<Depends filename="libjackserver.cbp" />
</Project>
<Project filename="jack_portaudio.cbp">
......@@ -17,7 +17,7 @@
<Project filename="jack_netmanager.cbp">
<Depends filename="libjackserver.cbp" />
</Project>
<Project filename="jack_audioadapter.cbp" active="1">
<Project filename="jack_audioadapter.cbp">
<Depends filename="libjackserver.cbp" />
</Project>
<Project filename="jack_netadapter.cbp">
......
......@@ -7,7 +7,7 @@
<Option compiler="gcc" />
<Build>
<Target title="Win32 Release">
<Option output="Release\bin\libjackmp" prefix_auto="1" extension_auto="1" />
<Option output="Release\bin\libjack" prefix_auto="1" extension_auto="1" />
<Option object_output="Release" />
<Option type="3" />
<Option compiler="gcc" />
......@@ -46,7 +46,7 @@
</Linker>
</Target>
<Target title="Win32 Debug">
<Option output="Debug\bin\libjackmp" prefix_auto="1" extension_auto="1" />
<Option output="Debug\bin\libjack" prefix_auto="1" extension_auto="1" />
<Option object_output="Debug" />
<Option type="3" />
<Option compiler="gcc" />
......@@ -85,7 +85,7 @@
</Linker>
</Target>
<Target title="Win32 Monitor">
<Option output="Release\bin\libjackmp" prefix_auto="1" extension_auto="1" />
<Option output="Release\bin\libjack" prefix_auto="1" extension_auto="1" />
<Option object_output="Release" />
<Option type="3" />
<Option compiler="gcc" />
......
......@@ -7,7 +7,7 @@
<Option compiler="gcc" />
<Build>
<Target title="Win32 Release">
<Option output="Release\bin\libjackservermp" prefix_auto="1" extension_auto="1" />
<Option output="Release\bin\libjackserver" prefix_auto="1" extension_auto="1" />
<Option object_output="Release" />
<Option type="3" />
<Option compiler="gcc" />
......@@ -33,7 +33,7 @@
</Compiler>
</Target>
<Target title="Win32 Debug">
<Option output="Debug\bin\libjackservermp" prefix_auto="1" extension_auto="1" />
<Option output="Debug\bin\libjackserver" prefix_auto="1" extension_auto="1" />
<Option object_output="Debug" />
<Option type="3" />
<Option compiler="gcc" />
......@@ -59,7 +59,7 @@
</Compiler>
</Target>
<Target title="Win32 Monitor">
<Option output="Release\bin\libjackservermp" prefix_auto="1" extension_auto="1" />
<Option output="Release\bin\libjackserver" prefix_auto="1" extension_auto="1" />
<Option object_output="Release" />
<Option type="3" />
<Option compiler="gcc" />
......
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