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

Restore old JackRouter, libjackservermp and libjackmp on windows. 

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2841 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.90
moret 17 years ago
parent
52b822cbe6
commit
7916bad242
20 changed files with 41 additions and 618 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +12
    -12
      common/JackDriverLoader.cpp
  2. BIN
      windows/Setup/JackRouter.dll
  3. +2
    -2
      windows/Setup/JackRouter.ini
  4. +6
    -6
      windows/Setup/jack.ci
  5. +1
    -46
      windows/jack_audioadapter.cbp
  6. +1
    -40
      windows/jack_connect.cbp
  7. +1
    -40
      windows/jack_disconnect.cbp
  8. +1
    -40
      windows/jack_dummy.cbp
  9. +1
    -40
      windows/jack_load.cbp
  10. +1
    -37
      windows/jack_lsp.cbp
  11. +1
    -40
      windows/jack_metro.cbp
  12. +1
    -46
      windows/jack_netadapter.cbp
  13. +1
    -46
      windows/jack_netdriver.cbp
  14. +1
    -46
      windows/jack_netmanager.cbp
  15. +1
    -44
      windows/jack_portaudio.cbp
  16. +1
    -40
      windows/jack_unload.cbp
  17. +1
    -40
      windows/jackd.cbp
  18. +2
    -2
      windows/jackd.workspace
  19. +3
    -3
      windows/libjack.cbp
  20. +3
    -48
      windows/libjackserver.cbp

+ 12
- 12
common/JackDriverLoader.cpp View File

@@ -96,7 +96,7 @@ EXPORT void jack_free_driver_params(JSList * driver_params)
{
JSList *node_ptr = driver_params;
JSList *next_node_ptr;
while (node_ptr) {
next_node_ptr = node_ptr->next;
free(node_ptr->data);
@@ -454,10 +454,10 @@ jack_get_descriptor (JSList * drivers, const char * sofile, const char * symbol)

#ifdef WIN32
if ((so_get_descriptor == NULL) && (dlerr = GetLastError()) != 0) {
jack_error("jack_get_descriptor err = %ld", dlerr);
jack_log("jack_get_descriptor : dll is not a driver, err = %ld", dlerr);
#else
if ((so_get_descriptor == NULL) && (dlerr = dlerror ()) != NULL) {
jack_error("jack_get_descriptor err = %s", dlerr);
jack_log("jack_get_descriptor err = %s", dlerr);
#endif

UnloadDriverModule(dlhandle);
@@ -501,7 +501,7 @@ jack_get_descriptor (JSList * drivers, const char * sofile, const char * symbol)
}

static bool check_symbol(const char* sofile, const char* symbol)
{
{
void * dlhandle;
bool res = false;
const char* driver_dir;
@@ -519,10 +519,10 @@ static bool check_symbol(const char* sofile, const char* symbol)
driver_dir = ADDON_DIR;
#endif
}
char* filename = (char *)malloc(strlen (driver_dir) + 1 + strlen(sofile) + 1);
sprintf (filename, "%s/%s", driver_dir, sofile);
if ((dlhandle = LoadDriverModule(filename)) == NULL) {
#ifdef WIN32
jack_error ("could not open component .dll '%s': %ld\n", filename, GetLastError());
@@ -533,7 +533,7 @@ static bool check_symbol(const char* sofile, const char* symbol)
res = (GetProc(dlhandle, symbol)) ? true : false;
UnloadDriverModule(dlhandle);
}
free(filename);
return res;
}
@@ -687,7 +687,7 @@ jack_internals_load (JSList * internals) {
}

do {
ptr = strrchr (filedata.cFileName, '.');
if (!ptr) {
continue;
@@ -696,12 +696,12 @@ jack_internals_load (JSList * internals) {
if (strncmp ("dll", ptr, 3) != 0) {
continue;
}
/* check if dll is an internal client */
if (!check_symbol(filedata.cFileName, "jack_internal_initialize")) {
continue;
}
desc = jack_get_descriptor (internals, filedata.cFileName, "jack_get_descriptor");
if (desc) {
driver_list = jack_slist_append (driver_list, desc);
@@ -752,12 +752,12 @@ jack_internals_load (JSList * internals) {
if (strncmp ("so", ptr, 2) != 0) {
continue;
}
/* check if dll is an internal client */
if (!check_symbol(dir_entry->d_name, "jack_internal_initialize")) {
continue;
}
desc = jack_get_descriptor (internals, dir_entry->d_name, "jack_get_descriptor");
if (desc) {
driver_list = jack_slist_append (driver_list, desc);


BIN
windows/Setup/JackRouter.dll View File


+ 2
- 2
windows/Setup/JackRouter.ini View File

@@ -1,6 +1,6 @@
[IO]
input=18
output=18
input=4
output=4
[AUTO_CONNECT]
input=1


+ 6
- 6
windows/Setup/jack.ci View File

@@ -53,10 +53,10 @@
<bgfoot> </>
<bgback> </>
<files listview >
<_><src>..\Release\bin\libjack.a</><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.def</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
<_><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\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 +64,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\libjack.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
<_><src>..\Release\bin\libjackserver.dll</><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\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</></>


+ 1
- 46
windows/jack_audioadapter.cbp View File

@@ -21,21 +21,6 @@
<Add directory="..\windows" />
</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="portaudio_x86" />
<Add library="libsamplerate-0" />
<Add library="libjackserver" />
<Add directory="Release\bin" />
</Linker>
</Target>
@@ -54,21 +39,6 @@
<Add directory="..\windows" />
</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="portaudio_x86" />
<Add library="libsamplerate-0" />
<Add library="libjackserver" />
<Add directory="Debug\bin" />
</Linker>
</Target>
@@ -88,21 +58,6 @@
<Add directory="..\windows" />
</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="portaudio_x86" />
<Add library="libsamplerate-0" />
<Add library="libjackserver" />
<Add directory="Release\bin" />
</Linker>
</Target>
@@ -125,7 +80,7 @@
<Add library="odbccp32" />
<Add library="portaudio_x86" />
<Add library="libsamplerate-0" />
<Add library="libjackserver" />
<Add library="libjackservermp" />
</Linker>
<Unit filename="..\common\JackAudioAdapter.cpp" />
<Unit filename="..\common\JackAudioAdapterFactory.cpp" />


+ 1
- 40
windows/jack_connect.cbp View File

@@ -19,19 +19,6 @@
<Add directory="..\example-clients" />
</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 directory="Release\bin" />
</Linker>
</Target>
@@ -48,19 +35,6 @@
<Add directory="..\example-clients" />
</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 directory="Release\bin" />
</Linker>
</Target>
@@ -78,19 +52,6 @@
<Add directory="..\example-clients" />
</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 directory="Release\bin" />
</Linker>
</Target>
@@ -111,7 +72,7 @@
<Add library="uuid" />
<Add library="odbc32" />
<Add library="odbccp32" />
<Add library="libjack" />
<Add library="libjackmp" />
</Linker>
<Unit filename="..\example-clients\connect.c">
<Option compilerVar="CC" />


+ 1
- 40
windows/jack_disconnect.cbp View File

@@ -19,19 +19,6 @@
<Add directory="..\example-clients" />
</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 directory="Release\bin" />
</Linker>
</Target>
@@ -48,19 +35,6 @@
<Add directory="..\example-clients" />
</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 directory="Release\bin" />
</Linker>
</Target>
@@ -78,19 +52,6 @@
<Add directory="..\example-clients" />
</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 directory="Release\bin" />
</Linker>
</Target>
@@ -111,7 +72,7 @@
<Add library="uuid" />
<Add library="odbc32" />
<Add library="odbccp32" />
<Add library="libjack" />
<Add library="libjackmp" />
</Linker>
<Unit filename="..\example-clients\connect.c">
<Option compilerVar="CC" />


+ 1
- 40
windows/jack_dummy.cbp View File

@@ -20,19 +20,6 @@
<Add directory="..\windows" />
</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="libjackserver" />
<Add directory="Release\bin" />
</Linker>
</Target>
@@ -50,19 +37,6 @@
<Add directory="..\windows" />
</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="libjackserver" />
<Add directory="Debug\bin" />
</Linker>
</Target>
@@ -81,19 +55,6 @@
<Add directory="..\windows" />
</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="libjackserver" />
<Add directory="Release\bin" />
</Linker>
</Target>
@@ -114,7 +75,7 @@
<Add library="uuid" />
<Add library="odbc32" />
<Add library="odbccp32" />
<Add library="libjackserver" />
<Add library="libjackservermp" />
</Linker>
<Unit filename="..\common\JackDummyDriver.cpp" />
<Extensions>


+ 1
- 40
windows/jack_load.cbp View File

@@ -20,19 +20,6 @@
<Add directory="..\windows" />
</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 directory="Release\bin" />
</Linker>
</Target>
@@ -49,19 +36,6 @@
<Add directory="..\windows" />
</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 directory="Debug\bin" />
</Linker>
</Target>
@@ -80,19 +54,6 @@
<Add directory="..\windows" />
</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 directory="Release\bin" />
</Linker>
</Target>
@@ -113,7 +74,7 @@
<Add library="uuid" />
<Add library="odbc32" />
<Add library="odbccp32" />
<Add library="libjack" />
<Add library="libjackmp" />
</Linker>
<Unit filename="..\example-clients\ipload.c">
<Option compilerVar="CC" />


+ 1
- 37
windows/jack_lsp.cbp View File

@@ -19,18 +19,6 @@
<Add directory="..\common\jack" />
</Compiler>
<Linker>
<Add library="kernel32" />
<Add library="user32" />
<Add library="gdi32" />
<Add library="winspool" />
<Add library="comdlg32" />
<Add library="shell32" />
<Add library="ole32" />
<Add library="oleaut32" />
<Add library="uuid" />
<Add library="odbc32" />
<Add library="odbccp32" />
<Add library="libjack" />
<Add directory="Release\bin" />
</Linker>
</Target>
@@ -46,18 +34,6 @@
<Add directory="..\common\jack" />
</Compiler>
<Linker>
<Add library="kernel32" />
<Add library="user32" />
<Add library="gdi32" />
<Add library="winspool" />
<Add library="comdlg32" />
<Add library="shell32" />
<Add library="ole32" />
<Add library="oleaut32" />
<Add library="uuid" />
<Add library="odbc32" />
<Add library="odbccp32" />
<Add library="libjack" />
<Add directory="Debug\bin" />
</Linker>
</Target>
@@ -74,18 +50,6 @@
<Add directory="..\common\jack" />
</Compiler>
<Linker>
<Add library="kernel32" />
<Add library="user32" />
<Add library="gdi32" />
<Add library="winspool" />
<Add library="comdlg32" />
<Add library="shell32" />
<Add library="ole32" />
<Add library="oleaut32" />
<Add library="uuid" />
<Add library="odbc32" />
<Add library="odbccp32" />
<Add library="libjack" />
<Add directory="Release\bin" />
</Linker>
</Target>
@@ -105,7 +69,7 @@
<Add library="uuid" />
<Add library="odbc32" />
<Add library="odbccp32" />
<Add library="libjack" />
<Add library="libjackmp" />
</Linker>
<Unit filename="..\example-clients\lsp.c">
<Option compilerVar="CC" />


+ 1
- 40
windows/jack_metro.cbp View File

@@ -20,19 +20,6 @@
<Add directory="..\windows" />
</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 directory="Release\bin" />
</Linker>
</Target>
@@ -50,19 +37,6 @@
<Add directory="..\windows" />
</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 directory="Debug\bin" />
</Linker>
</Target>
@@ -81,19 +55,6 @@
<Add directory="..\windows" />
</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 directory="Release\bin" />
</Linker>
</Target>
@@ -114,7 +75,7 @@
<Add library="uuid" />
<Add library="odbc32" />
<Add library="odbccp32" />
<Add library="libjack" />
<Add library="libjackmp" />
</Linker>
<Unit filename="..\example-clients\metro.c">
<Option compilerVar="CC" />


+ 1
- 46
windows/jack_netadapter.cbp View File

@@ -20,21 +20,6 @@
<Add directory="..\windows" />
</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="libsamplerate-0" />
<Add directory="Release\bin" />
</Linker>
</Target>
@@ -52,21 +37,6 @@
<Add directory="..\windows" />
</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="libsamplerate-0" />
<Add directory="Debug\bin" />
</Linker>
</Target>
@@ -85,21 +55,6 @@
<Add directory="..\windows" />
</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="libsamplerate-0" />
<Add directory="Release\bin" />
</Linker>
</Target>
@@ -124,7 +79,7 @@
<Add library="uuid" />
<Add library="odbc32" />
<Add library="odbccp32" />
<Add library="libjackserver" />
<Add library="libjackservermp" />
<Add library="libsamplerate-0" />
<Add directory="Release\bin" />
</Linker>


+ 1
- 46
windows/jack_netdriver.cbp View File

@@ -20,21 +20,6 @@
<Add directory="..\windows" />
</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" />
<Add directory="Release\bin" />
</Linker>
</Target>
@@ -52,21 +37,6 @@
<Add directory="..\windows" />
</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" />
<Add directory="Debug\bin" />
</Linker>
</Target>
@@ -85,21 +55,6 @@
<Add directory="..\windows" />
</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" />
<Add directory="Release\bin" />
</Linker>
</Target>
@@ -121,7 +76,7 @@
<Add library="uuid" />
<Add library="odbc32" />
<Add library="odbccp32" />
<Add library="libjackserver" />
<Add library="libjackservermp" />
<Add library="ws2_32" />
</Linker>
<Unit filename="..\common\JackNetDriver.cpp" />


+ 1
- 46
windows/jack_netmanager.cbp View File

@@ -19,21 +19,6 @@
<Add directory="..\windows" />
</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="ws2_32" />
<Add library="libjackserver" />
<Add directory="Release\bin" />
</Linker>
</Target>
@@ -50,21 +35,6 @@
<Add directory="..\windows" />
</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="ws2_32" />
<Add library="libjackserver" />
<Add directory="Debug\bin" />
</Linker>
</Target>
@@ -82,21 +52,6 @@
<Add directory="..\windows" />
</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="ws2_32" />
<Add library="libjackserver" />
<Add directory="Release\bin" />
</Linker>
</Target>
@@ -119,7 +74,7 @@
<Add library="odbc32" />
<Add library="odbccp32" />
<Add library="ws2_32" />
<Add library="libjackserver" />
<Add library="libjackservermp" />
</Linker>
<Unit filename="..\common\JackNetManager.cpp" />
<Unit filename="jacknetmanager.rc">


+ 1
- 44
windows/jack_portaudio.cbp View File

@@ -25,21 +25,6 @@
<Add directory="..\common\jack" />
</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="libjackserver" />
<Add library="portaudio_x86" />
<Add directory="Release\bin" />
<Add directory="..\windows" />
</Linker>
</Target>
@@ -62,20 +47,6 @@
<Add directory="..\common\jack" />
</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="libjackserver" />
<Add library="portaudio_x86" />
<Add directory="Debug\bin" />
<Add directory="..\windows" />
</Linker>
@@ -100,20 +71,6 @@
<Add directory="..\common\jack" />
</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="libjackserver" />
<Add library="portaudio_x86" />
<Add directory="Release\bin" />
<Add directory="..\windows" />
</Linker>
@@ -135,7 +92,7 @@
<Add library="uuid" />
<Add library="odbc32" />
<Add library="odbccp32" />
<Add library="libjackserver" />
<Add library="libjackservermp" />
<Add library="portaudio_x86" />
</Linker>
<Unit filename="JackPortAudioDevices.cpp" />


+ 1
- 40
windows/jack_unload.cbp View File

@@ -19,19 +19,6 @@
<Add directory="..\windows" />
</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 directory="Release\bin" />
</Linker>
</Target>
@@ -48,19 +35,6 @@
<Add directory="..\windows" />
</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 directory="Debug\bin" />
</Linker>
</Target>
@@ -78,19 +52,6 @@
<Add directory="..\windows" />
</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 directory="Release\bin" />
</Linker>
</Target>
@@ -111,7 +72,7 @@
<Add library="uuid" />
<Add library="odbc32" />
<Add library="odbccp32" />
<Add library="libjack" />
<Add library="libjackmp" />
</Linker>
<Unit filename="..\example-clients\ipunload.c">
<Option compilerVar="CC" />


+ 1
- 40
windows/jackd.cbp View File

@@ -25,19 +25,6 @@
<Add directory="..\common\jack" />
</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="libjackserver" />
<Add directory="Release\bin" />
</Linker>
</Target>
@@ -59,19 +46,6 @@
<Add directory="..\common\jack" />
</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="libjackserver" />
<Add directory="Debug\bin" />
</Linker>
</Target>
@@ -95,19 +69,6 @@
<Add directory="..\common\jack" />
</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="libjackserver" />
<Add directory="Release\bin" />
</Linker>
</Target>
@@ -128,7 +89,7 @@
<Add library="uuid" />
<Add library="odbc32" />
<Add library="odbccp32" />
<Add library="libjackserver" />
<Add library="libjackservermp" />
</Linker>
<Unit filename="..\common\Jackdmp.cpp" />
<Unit filename="getopt.c">


+ 2
- 2
windows/jackd.workspace View File

@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_workspace_file>
<Workspace title="jack">
<Project filename="libjackserver.cbp" />
<Project filename="libjackserver.cbp" active="1" />
<Project filename="jackd.cbp">
<Depends filename="libjackserver.cbp" />
</Project>
<Project filename="jack_portaudio.cbp" active="1">
<Project filename="jack_portaudio.cbp">
<Depends filename="libjackserver.cbp" />
<Depends filename="jackd.cbp" />
</Project>


+ 3
- 3
windows/libjack.cbp View File

@@ -7,7 +7,7 @@
<Option compiler="gcc" />
<Build>
<Target title="Win32 Release">
<Option output="Release\bin\libjack" prefix_auto="1" extension_auto="1" />
<Option output="Release\bin\libjackmp" prefix_auto="1" extension_auto="1" />
<Option object_output="Release" />
<Option type="3" />
<Option compiler="gcc" />
@@ -45,7 +45,7 @@
</Linker>
</Target>
<Target title="Win32 Debug">
<Option output="Debug\bin\libjack" prefix_auto="1" extension_auto="1" />
<Option output="Debug\bin\libjackmp" prefix_auto="1" extension_auto="1" />
<Option object_output="Debug" />
<Option type="3" />
<Option compiler="gcc" />
@@ -83,7 +83,7 @@
</Linker>
</Target>
<Target title="Win32 Monitor">
<Option output="Release\bin\libjack" prefix_auto="1" extension_auto="1" />
<Option output="Release\bin\libjackmp" prefix_auto="1" extension_auto="1" />
<Option object_output="Release" />
<Option type="3" />
<Option compiler="gcc" />


+ 3
- 48
windows/libjackserver.cbp View File

@@ -7,7 +7,7 @@
<Option compiler="gcc" />
<Build>
<Target title="Win32 Release">
<Option output="Release\bin\libjackserver" prefix_auto="1" extension_auto="1" />
<Option output="Release\bin\libjackservermp" prefix_auto="1" extension_auto="1" />
<Option object_output="Release" />
<Option type="3" />
<Option compiler="gcc" />
@@ -29,24 +29,9 @@
<Add directory="..\common" />
<Add directory="..\common\jack" />
</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="ws2_32" />
</Linker>
</Target>
<Target title="Win32 Debug">
<Option output="Debug\bin\libjackserver" prefix_auto="1" extension_auto="1" />
<Option output="Debug\bin\libjackservermp" prefix_auto="1" extension_auto="1" />
<Option object_output="Debug" />
<Option type="3" />
<Option compiler="gcc" />
@@ -68,24 +53,9 @@
<Add directory="..\common" />
<Add directory="..\common\jack" />
</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="ws2_32" />
</Linker>
</Target>
<Target title="Win32 Monitor">
<Option output="Release\bin\libjackserver" prefix_auto="1" extension_auto="1" />
<Option output="Release\bin\libjackservermp" prefix_auto="1" extension_auto="1" />
<Option object_output="Release" />
<Option type="3" />
<Option compiler="gcc" />
@@ -108,21 +78,6 @@
<Add directory="..\common" />
<Add directory="..\common\jack" />
</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="ws2_32" />
</Linker>
</Target>
</Build>
<Compiler>


Write Preview
Loading…
Cancel
Save