Merge branch 'master' of git://repo.or.cz/jack2 into newer-midi

common/JackControlAPI.cpp

@@ -215,7 +215,7 @@ bool
 jackctl_add_driver_parameters(
     struct jackctl_driver * driver_ptr)
 {
-    int i;
+    unsigned int i;
 
     union jackctl_parameter_value jackctl_value;
     jackctl_param_type_t jackctl_type;
@@ -1236,13 +1236,14 @@ EXPORT bool jackctl_server_remove_slave(jackctl_server * server_ptr, jackctl_dri
         if (server_ptr->engine->IsRunning()) {
             jack_error("cannot remove a slave from a running server");
             return false;
-        } else {
-            JackDriverInfo* info = (JackDriverInfo*)driver_ptr->infos->data;
-            if (info) {
+        } else {
+            if (driver_ptr->infos) {
+                JackDriverInfo* info = (JackDriverInfo*)driver_ptr->infos->data;
+                assert(info);
                 driver_ptr->infos = jack_slist_remove(driver_ptr->infos, info);
                 server_ptr->engine->RemoveSlave(info);
                 delete info;
-                return true;
+                return true;
             } else {
                 return false;
             }

common/JackWeakAPI.cpp

@@ -235,7 +235,7 @@ DECL_FUNCTION(jack_time_t, jack_frames_to_time, (const jack_client_t *client, ja
 DECL_FUNCTION(jack_nframes_t, jack_frame_time, (const jack_client_t *client), (client));
 DECL_FUNCTION(jack_nframes_t, jack_last_frame_time, (const jack_client_t *client), (client));
 DECL_FUNCTION(float, jack_cpu_load, (jack_client_t *client), (client));
-DECL_FUNCTION_NULL(pthread_t, jack_client_thread_id, (jack_client_t *client), (client));
+DECL_FUNCTION_NULL(jack_native_thread_t, jack_client_thread_id, (jack_client_t *client), (client));
 DECL_VOID_FUNCTION(jack_set_error_function, (print_function fun), (fun));
 DECL_VOID_FUNCTION(jack_set_info_function, (print_function fun), (fun));
 
@@ -261,17 +261,17 @@ DECL_VOID_FUNCTION(jack_set_transport_info, (jack_client_t *client, jack_transpo
 
 DECL_FUNCTION(int, jack_client_real_time_priority, (jack_client_t* client), (client));
 DECL_FUNCTION(int, jack_client_max_real_time_priority, (jack_client_t* client), (client));
-DECL_FUNCTION(int, jack_acquire_real_time_scheduling, (pthread_t thread, int priority), (thread, priority));
+DECL_FUNCTION(int, jack_acquire_real_time_scheduling, (jack_native_thread_t thread, int priority), (thread, priority));
 DECL_FUNCTION(int, jack_client_create_thread, (jack_client_t* client,
-                                      pthread_t *thread,
+                                      jack_native_thread_t *thread,
                                       int priority,
                                       int realtime, 	// boolean
                                       thread_routine routine,
                                       void *arg), (client, thread, priority, realtime, routine, arg));
-DECL_FUNCTION(int, jack_drop_real_time_scheduling, (pthread_t thread), (thread));
+DECL_FUNCTION(int, jack_drop_real_time_scheduling, (jack_native_thread_t thread), (thread));
 
-DECL_FUNCTION(int, jack_client_stop_thread, (jack_client_t* client, pthread_t thread), (client, thread));
-DECL_FUNCTION(int, jack_client_kill_thread, (jack_client_t* client, pthread_t thread), (client, thread));
+DECL_FUNCTION(int, jack_client_stop_thread, (jack_client_t* client, jack_native_thread_t thread), (client, thread));
+DECL_FUNCTION(int, jack_client_kill_thread, (jack_client_t* client, jack_native_thread_t thread), (client, thread));
 #ifndef WIN32
 DECL_VOID_FUNCTION(jack_set_thread_creator, (jack_thread_creator_t jtc), (jtc));
 #endif

common/jack/jack.h

@@ -310,7 +310,7 @@ int jack_set_thread_init_callback (jack_client_t *client,
  * jack_on_info_shutdown() will.
  */
 void jack_on_shutdown (jack_client_t *client,
-                       JackShutdownCallback shutdown_callback, void *arg) JACK_WEAK_EXPORT;
+                       JackShutdownCallback shutdown_callback, void *arg) JACK_OPTIONAL_WEAK_EXPORT;
 
 /**
  * @param client pointer to JACK client structure.
@@ -336,7 +336,7 @@ void jack_on_shutdown (jack_client_t *client,
  * jack_on_info_shutdown() will.
  */
 void jack_on_info_shutdown (jack_client_t *client,
-                            JackInfoShutdownCallback shutdown_callback, void *arg) JACK_OPTIONAL_WEAK_EXPORT;
+                            JackInfoShutdownCallback shutdown_callback, void *arg) JACK_WEAK_EXPORT;
 
 /**
  * Tell the Jack server to call @a process_callback whenever there is

common/jack/weakmacros.h

@@ -40,13 +40,23 @@
    the symbol it used with. For this to work full may
    require linker arguments in the client as well.
 */
-#define JACK_WEAK_EXPORT __attribute__((weak))
+
+#ifdef WIN32
+    /*
+        Not working with __declspec(dllexport) so normal linking 
+        Linking with JackWeakAPI.cpp will be the preferred way.
+    */
+    #define JACK_WEAK_EXPORT
 #else
-/* Add other things here for non-gcc platforms */
-
-#ifdef WIN32
-#define JACK_WEAK_EXPORT
-#endif
+    #define JACK_WEAK_EXPORT __attribute__((weak))
+#endif
+
+#else
+/* Add other things here for non-gcc platforms */
+
+#ifdef WIN32
+#define JACK_WEAK_EXPORT
+#endif
 
 #endif
 #endif
@@ -59,13 +69,14 @@
 #ifdef __GNUC__
 #define JACK_OPTIONAL_WEAK_DEPRECATED_EXPORT __attribute__((__deprecated__))
 #else
-/* Add other things here for non-gcc platforms */
-
-#ifdef WIN32
-#define JACK_OPTIONAL_WEAK_DEPRECATED_EXPORT
-#endif
+/* Add other things here for non-gcc platforms */
+
+#ifdef WIN32
+#define JACK_OPTIONAL_WEAK_DEPRECATED_EXPORT
+#endif
 
 #endif /* __GNUC__ */
 #endif
 
 #endif /* __weakmacros_h__ */
+

common/netjack.c

@@ -58,9 +58,6 @@ $Id: net_driver.c,v 1.17 2006/04/16 20:16:10 torbenh Exp $
 #include "netjack.h"
 #include "netjack_packet.h"
 
-// JACK2
-#include "control.h"
-
 #define MIN(x,y) ((x)<(y) ? (x) : (y))
 
 static int sync_state = 1;

common/netjack_packet.c

@@ -74,9 +74,6 @@
 
 #include "netjack_packet.h"
 
-// JACK2 specific.
-#include "control.h"
-
 #ifdef NO_JACK_ERROR
 #define jack_error printf
 #endif

dbus/controller.c

@@ -64,6 +64,56 @@ jack_controller_find_driver(
     return NULL;
 }
 
+bool
+jack_controller_add_slave_drivers(
+    struct jack_controller * controller_ptr)
+{
+    struct list_head * node_ptr;
+    struct jack_controller_slave_driver * driver_ptr;
+
+    list_for_each(node_ptr, &controller_ptr->slave_drivers)
+    {
+        driver_ptr = list_entry(node_ptr, struct jack_controller_slave_driver, siblings);
+        driver_ptr->handle = jack_controller_find_driver(controller_ptr->server, driver_ptr->name);
+
+        if (driver_ptr->handle == NULL)
+        {
+            jack_error("Unknown driver \"%s\"", driver_ptr->name);
+            goto fail;
+        }
+
+        if (!jackctl_server_add_slave(controller_ptr->server, driver_ptr->handle))
+        {
+            jack_error("Driver \"%s\" cannot be loaded", driver_ptr->name);
+            goto fail;
+        }
+    }
+
+    return true;
+
+fail:
+    driver_ptr->handle = NULL;
+    return false;
+}
+
+void
+jack_controller_remove_slave_drivers(
+    struct jack_controller * controller_ptr)
+{
+    struct list_head * node_ptr;
+    struct jack_controller_slave_driver * driver_ptr;
+
+    list_for_each(node_ptr, &controller_ptr->slave_drivers)
+    {
+        driver_ptr = list_entry(node_ptr, struct jack_controller_slave_driver, siblings);
+        if (driver_ptr->handle != NULL)
+        {
+            jackctl_server_remove_slave(controller_ptr->server, driver_ptr->handle);
+            driver_ptr->handle = NULL;
+        }
+    }
+}
+
 jackctl_internal_t *
 jack_controller_find_internal(
     jackctl_server_t *server,
@@ -161,6 +211,8 @@ jack_controller_start_server(
         goto fail;
     }
 
+    jack_controller_add_slave_drivers(controller_ptr);
+
     if (!jackctl_server_start(
             controller_ptr->server))
     {
@@ -221,6 +273,8 @@ fail_stop_server:
     }
 
 fail_close_server:
+    jack_controller_remove_slave_drivers(controller_ptr);
+
     if (!jackctl_server_close(controller_ptr->server))
     {
         jack_error("failed to close jack server");
@@ -263,6 +317,8 @@ jack_controller_stop_server(
         return FALSE;
     }
 
+    jack_controller_remove_slave_drivers(controller_ptr);
+
     if (!jackctl_server_close(controller_ptr->server))
     {
         jack_dbus_error(dbus_call_context_ptr, JACK_DBUS_ERROR_GENERIC, "Failed to close server");
@@ -387,6 +443,7 @@ jack_controller_create(
     controller_ptr->started = false;
     controller_ptr->driver = NULL;
     controller_ptr->driver_set = false;
+    INIT_LIST_HEAD(&controller_ptr->slave_drivers);
 
     drivers = (JSList *)jackctl_server_get_drivers_list(controller_ptr->server);
     controller_ptr->drivers_count = jack_slist_length(drivers);
@@ -465,41 +522,58 @@ fail:
 }
 
 bool
-jack_controller_add_slave(
-    struct jack_controller *controller_ptr,
+jack_controller_add_slave_driver(
+    struct jack_controller * controller_ptr,
     const char * driver_name)
 {
-    jackctl_driver_t *driver;
+    struct jack_controller_slave_driver * driver_ptr;
 
-    driver = jack_controller_find_driver(controller_ptr->server, driver_name);
-      
-    if (driver == NULL)
+    driver_ptr = malloc(sizeof(struct jack_controller_slave_driver));
+    if (driver_ptr == NULL)
     {
+        jack_error("malloc() failed to allocate jack_controller_slave_driver struct");
         return false;
     }
 
-    jack_info("driver \"%s\" selected", driver_name);
+    driver_ptr->name = strdup(driver_name);
+    if (driver_ptr->name == NULL)
+    {
+        jack_error("strdup() failed for slave driver name \"%s\"", driver_name);
+        free(driver_ptr);
+        return false;
+    }
+
+    driver_ptr->handle = NULL;
 
-    return jackctl_server_add_slave(controller_ptr->server, driver);
+    jack_info("slave driver \"%s\" added", driver_name);
+
+    list_add_tail(&driver_ptr->siblings, &controller_ptr->slave_drivers);
+
+    return true;
 }
 
 bool
-jack_controller_remove_slave(
-    struct jack_controller *controller_ptr,
+jack_controller_remove_slave_driver(
+    struct jack_controller * controller_ptr,
     const char * driver_name)
 {
-    jackctl_driver_t *driver;
+    struct list_head * node_ptr;
+    struct jack_controller_slave_driver * driver_ptr;
 
-    driver = jack_controller_find_driver(controller_ptr->server, driver_name);
-      
-    if (driver == NULL)
+    list_for_each(node_ptr, &controller_ptr->slave_drivers)
     {
-        return false;
+        driver_ptr = list_entry(node_ptr, struct jack_controller_slave_driver, siblings);
+        if (strcmp(driver_ptr->name, driver_name) == 0)
+        {
+            jack_info("slave driver \"%s\" removed", driver_name);
+            list_del(&driver_ptr->siblings);
+            free(driver_ptr->name);
+            free(driver_ptr);
+            return true;
+        }
     }
 
-    jack_info("driver \"%s\" selected", driver_name);
-
-    return jackctl_server_remove_slave(controller_ptr->server, driver);
+    return false;
 }
 
 bool

dbus/controller_iface_configure.c

@@ -603,6 +603,73 @@ oom:
     jack_error ("Ran out of memory trying to construct method return");
 }
 
+static
+void
+jack_controller_fill_parameter_info(
+    jackctl_parameter_t * parameter,
+    struct parameter_info * info_ptr)
+{
+    info_ptr->type = jackctl_parameter_get_type(parameter);
+    info_ptr->name = jackctl_parameter_get_name(parameter);
+    info_ptr->short_decr = jackctl_parameter_get_short_description(parameter);
+    info_ptr->long_descr = jackctl_parameter_get_long_description(parameter);
+}
+
+static
+bool
+jack_controller_append_parameter_info_struct(
+    DBusMessageIter * iter_ptr,
+    struct parameter_info * info_ptr)
+{
+    DBusMessageIter struct_iter;
+    unsigned char type;
+
+    /* Open the struct. */
+    if (!dbus_message_iter_open_container(iter_ptr, DBUS_TYPE_STRUCT, NULL, &struct_iter))
+    {
+        goto fail;
+    }
+
+    /* Append parameter type. */
+    type = PARAM_TYPE_JACK_TO_DBUS(info_ptr->type);
+    if (!dbus_message_iter_append_basic(&struct_iter, DBUS_TYPE_BYTE, &type))
+    {
+        goto fail_close;
+    }
+
+    /* Append parameter name. */
+    if (!dbus_message_iter_append_basic(&struct_iter, DBUS_TYPE_STRING, &info_ptr->name))
+    {
+        goto fail_close;
+    }
+
+    /* Append parameter short description. */
+    if (!dbus_message_iter_append_basic(&struct_iter, DBUS_TYPE_STRING, &info_ptr->short_decr))
+    {
+        goto fail_close;
+    }
+
+    /* Append parameter long description. */
+    if (!dbus_message_iter_append_basic(&struct_iter, DBUS_TYPE_STRING, &info_ptr->long_descr))
+    {
+        goto fail_close;
+    }
+
+    /* Close the struct. */
+    if (!dbus_message_iter_close_container(iter_ptr, &struct_iter))
+    {
+        goto fail;
+    }
+
+    return true;
+
+fail_close:
+    dbus_message_iter_close_container(iter_ptr, &struct_iter);
+
+fail:
+    return false;
+}
+
 static
 void
 jack_controller_get_parameters_info(
@@ -610,9 +677,8 @@ jack_controller_get_parameters_info(
     struct parameter_info * special_parameter_info_ptr,
     const JSList * parameters_list)
 {
-    DBusMessageIter iter, array_iter, struct_iter;
-    unsigned char type;
-    const char *str;
+    DBusMessageIter iter, array_iter;
+    struct parameter_info info;
 
     call->reply = dbus_message_new_method_return (call->message);
     if (!call->reply)
@@ -630,39 +696,7 @@ jack_controller_get_parameters_info(
 
     if (special_parameter_info_ptr != NULL)
     {
-        /* Open the struct. */
-        if (!dbus_message_iter_open_container (&array_iter, DBUS_TYPE_STRUCT, NULL, &struct_iter))
-        {
-            goto fail_close_unref;
-        }
-
-        /* Append parameter type. */
-        type = PARAM_TYPE_JACK_TO_DBUS(special_parameter_info_ptr->type);
-        if (!dbus_message_iter_append_basic (&struct_iter, DBUS_TYPE_BYTE, &type))
-        {
-            goto fail_close2_unref;
-        }
-
-        /* Append parameter name. */
-        if (!dbus_message_iter_append_basic (&struct_iter, DBUS_TYPE_STRING, &special_parameter_info_ptr->name))
-        {
-            goto fail_close2_unref;
-        }
-
-        /* Append parameter short description. */
-        if (!dbus_message_iter_append_basic (&struct_iter, DBUS_TYPE_STRING, &special_parameter_info_ptr->short_decr))
-        {
-            goto fail_close2_unref;
-        }
-
-        /* Append parameter long description. */
-        if (!dbus_message_iter_append_basic (&struct_iter, DBUS_TYPE_STRING, &special_parameter_info_ptr->long_descr))
-        {
-            goto fail_close2_unref;
-        }
-
-        /* Close the struct. */
-        if (!dbus_message_iter_close_container (&array_iter, &struct_iter))
+        if (!jack_controller_append_parameter_info_struct(&array_iter, special_parameter_info_ptr))
         {
             goto fail_close_unref;
         }
@@ -671,42 +705,8 @@ jack_controller_get_parameters_info(
     /* Append parameter descriptions to the array. */
     while (parameters_list != NULL)
     {
-        /* Open the struct. */
-        if (!dbus_message_iter_open_container (&array_iter, DBUS_TYPE_STRUCT, NULL, &struct_iter))
-        {
-            goto fail_close_unref;
-        }
-
-        /* Append parameter type. */
-        type = PARAM_TYPE_JACK_TO_DBUS(jackctl_parameter_get_type(parameters_list->data));
-        if (!dbus_message_iter_append_basic (&struct_iter, DBUS_TYPE_BYTE, &type))
-        {
-            goto fail_close2_unref;
-        }
-
-        /* Append parameter name. */
-        str = jackctl_parameter_get_name(parameters_list->data);
-        if (!dbus_message_iter_append_basic (&struct_iter, DBUS_TYPE_STRING, &str))
-        {
-            goto fail_close2_unref;
-        }
-
-        /* Append parameter short description. */
-        str = jackctl_parameter_get_short_description(parameters_list->data);
-        if (!dbus_message_iter_append_basic (&struct_iter, DBUS_TYPE_STRING, &str))
-        {
-            goto fail_close2_unref;
-        }
-
-        /* Append parameter long description. */
-        str = jackctl_parameter_get_long_description(parameters_list->data);
-        if (!dbus_message_iter_append_basic (&struct_iter, DBUS_TYPE_STRING, &str))
-        {
-            goto fail_close2_unref;
-        }
-
-        /* Close the struct. */
-        if (!dbus_message_iter_close_container (&array_iter, &struct_iter))
+        jack_controller_fill_parameter_info(parameters_list->data, &info);
+        if (!jack_controller_append_parameter_info_struct(&array_iter, &info))
         {
             goto fail_close_unref;
         }
@@ -722,9 +722,6 @@ jack_controller_get_parameters_info(
 
     return;
 
-fail_close2_unref:
-    dbus_message_iter_close_container (&iter, &struct_iter);
-
 fail_close_unref:
     dbus_message_iter_close_container (&iter, &array_iter);
 
@@ -851,8 +848,7 @@ jack_controller_get_parameter_info_ex(
     struct jack_dbus_method_call * call,
     struct parameter_info * info_ptr)
 {
-    DBusMessageIter iter, struct_iter;
-    unsigned char type;
+    DBusMessageIter iter;
 
     call->reply = dbus_message_new_method_return(call->message);
     if (!call->reply)
@@ -862,48 +858,13 @@ jack_controller_get_parameter_info_ex(
 
     dbus_message_iter_init_append(call->reply, &iter);
 
-    /* Open the struct. */
-    if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_STRUCT, NULL, &struct_iter))
-    {
-        goto fail_unref;
-    }
-
-    /* Append parameter type. */
-    type = PARAM_TYPE_JACK_TO_DBUS(info_ptr->type);
-    if (!dbus_message_iter_append_basic(&struct_iter, DBUS_TYPE_BYTE, &type))
-    {
-        goto fail_close_unref;
-    }
-
-    /* Append parameter name. */
-    if (!dbus_message_iter_append_basic(&struct_iter, DBUS_TYPE_STRING, &info_ptr->name))
-    {
-        goto fail_close_unref;
-    }
-
-    /* Append parameter short description. */
-    if (!dbus_message_iter_append_basic(&struct_iter, DBUS_TYPE_STRING, &info_ptr->short_decr))
-    {
-        goto fail_close_unref;
-    }
-
-    /* Append parameter long description. */
-    if (!dbus_message_iter_append_basic(&struct_iter, DBUS_TYPE_STRING, &info_ptr->long_descr))
-    {
-        goto fail_close_unref;
-    }
-
-    /* Close the struct. */
-    if (!dbus_message_iter_close_container(&iter, &struct_iter))
+    if (!jack_controller_append_parameter_info_struct(&iter, info_ptr))
     {
         goto fail_unref;
     }
 
     return;
 
-fail_close_unref:
-    dbus_message_iter_close_container(&iter, &struct_iter);
-
 fail_unref:
     dbus_message_unref(call->reply);
     call->reply = NULL;
@@ -920,11 +881,7 @@ jack_controller_get_parameter_info(
 {
     struct parameter_info info;
 
-    info.type = jackctl_parameter_get_type(parameter);
-    info.name = jackctl_parameter_get_name(parameter);
-    info.short_decr = jackctl_parameter_get_short_description(parameter);
-    info.long_descr = jackctl_parameter_get_long_description(parameter);
-
+    jack_controller_fill_parameter_info(parameter, &info);
     jack_controller_get_parameter_info_ex(call, &info);
 }
 

dbus/controller_iface_control.c

@@ -229,10 +229,15 @@ jack_control_run_method(
                 "jack_controller_load_internal failed for internal (%s)", internal_name);
         }
     }
-    else if (strcmp (call->method_name, "AddSlave") == 0)
+    else if (strcmp (call->method_name, "AddSlaveDriver") == 0)
     {
         const char *driver_name;
 
+        if (controller_ptr->started)
+        {
+            goto fail_started;
+        }
+
         if (!jack_dbus_get_method_args(call, DBUS_TYPE_STRING, &driver_name, DBUS_TYPE_INVALID))
         {
             /* The method call had invalid arguments meaning that
@@ -241,17 +246,22 @@ jack_control_run_method(
             goto exit;
         }
         
-        if (!jack_controller_add_slave(controller_ptr, driver_name)) {
+        if (!jack_controller_add_slave_driver(controller_ptr, driver_name)) {
             jack_dbus_error(
                 call,
                 JACK_DBUS_ERROR_GENERIC,
-                "jack_controller_add_slave failed for driver (%s)", driver_name);
+                "jack_controller_add_slave_driver failed for driver (%s)", driver_name);
         }
     }
-    else if (strcmp (call->method_name, "RemoveSlave") == 0)
+    else if (strcmp (call->method_name, "RemoveSlaveDriver") == 0)
     {
         const char *driver_name;
 
+        if (controller_ptr->started)
+        {
+            goto fail_started;
+        }
+
         if (!jack_dbus_get_method_args(call, DBUS_TYPE_STRING, &driver_name, DBUS_TYPE_INVALID))
         {
             /* The method call had invalid arguments meaning that
@@ -260,11 +270,11 @@ jack_control_run_method(
             goto exit;
         }
         
-        if (!jack_controller_remove_slave(controller_ptr, driver_name)) {
+        if (!jack_controller_remove_slave_driver(controller_ptr, driver_name)) {
             jack_dbus_error(
                 call,
                 JACK_DBUS_ERROR_GENERIC,
-                "jack_controller_remove_slave failed for driver (%s)", driver_name);
+                "jack_controller_remove_slave_driver failed for driver (%s)", driver_name);
         }
     }
     else if (strcmp (call->method_name, "UnloadInternal") == 0)
@@ -293,8 +303,7 @@ jack_control_run_method(
     }
 
     jack_dbus_construct_method_return_single(call, type, arg);
-
-    return true;
+    goto exit;
 
 not_started:
     jack_dbus_only_error(
@@ -302,6 +311,15 @@ not_started:
         JACK_DBUS_ERROR_SERVER_NOT_RUNNING,
         "Can't execute method '%s' with stopped JACK server",
         call->method_name);
+    goto exit;
+
+fail_started:
+    jack_dbus_only_error(
+        call,
+        JACK_DBUS_ERROR_SERVER_RUNNING,
+        "Can't execute method '%s' with started JACK server",
+        call->method_name);
+    goto exit;
 
 exit:
     return true;
@@ -361,12 +379,12 @@ JACK_DBUS_METHOD_ARGUMENTS_BEGIN(UnloadInternal)
     JACK_DBUS_METHOD_ARGUMENT("internal", "s", false)
 JACK_DBUS_METHOD_ARGUMENTS_END
 
-JACK_DBUS_METHOD_ARGUMENTS_BEGIN(AddSlave)
-    JACK_DBUS_METHOD_ARGUMENT("internal", "s", false)
+JACK_DBUS_METHOD_ARGUMENTS_BEGIN(AddSlaveDriver)
+    JACK_DBUS_METHOD_ARGUMENT("driver_name", "s", false)
 JACK_DBUS_METHOD_ARGUMENTS_END
 
-JACK_DBUS_METHOD_ARGUMENTS_BEGIN(RemoveSlave)
-    JACK_DBUS_METHOD_ARGUMENT("internal", "s", false)
+JACK_DBUS_METHOD_ARGUMENTS_BEGIN(RemoveSlaveDriver)
+    JACK_DBUS_METHOD_ARGUMENT("driver_name", "s", false)
 JACK_DBUS_METHOD_ARGUMENTS_END
 
 JACK_DBUS_METHODS_BEGIN
@@ -384,8 +402,8 @@ JACK_DBUS_METHODS_BEGIN
     JACK_DBUS_METHOD_DESCRIBE(ResetXruns, NULL)
     JACK_DBUS_METHOD_DESCRIBE(LoadInternal, NULL)
     JACK_DBUS_METHOD_DESCRIBE(UnloadInternal, NULL)
-    JACK_DBUS_METHOD_DESCRIBE(AddSlave, NULL)
-    JACK_DBUS_METHOD_DESCRIBE(RemoveSlave, NULL)
+    JACK_DBUS_METHOD_DESCRIBE(AddSlaveDriver, NULL)
+    JACK_DBUS_METHOD_DESCRIBE(RemoveSlaveDriver, NULL)
 JACK_DBUS_METHODS_END
 
 JACK_DBUS_SIGNAL_ARGUMENTS_BEGIN(ServerStarted)

dbus/controller_internal.h

@@ -26,6 +26,14 @@
 #include "jack/control.h"
 #include "jack/jack.h"
 #include "jackdbus.h"
+#include "list.h"
+
+struct jack_controller_slave_driver
+{
+    struct list_head siblings;
+    char * name;
+    jackctl_driver_t * handle;
+};
 
 struct jack_controller
 {
@@ -45,6 +53,7 @@ struct jack_controller
 
     jackctl_driver_t *driver;
     bool driver_set;            /* whether driver is manually set, if false - DEFAULT_DRIVER is auto set */
+    struct list_head slave_drivers;
 
     struct jack_dbus_object_descriptor dbus_descriptor;
 };
@@ -87,12 +96,12 @@ jack_controller_switch_master(
     void *dbus_call_context_ptr);
     
 bool
-jack_controller_add_slave(
+jack_controller_add_slave_driver(
     struct jack_controller *controller_ptr,
     const char * driver_name);
     
 bool
-jack_controller_remove_slave(
+jack_controller_remove_slave_driver(
     struct jack_controller *controller_ptr,
     const char * driver_name);
 

dbus/jackdbus.h

@@ -46,6 +46,7 @@ jack_controller_settings_uninit();
 
 #define JACK_DBUS_ERROR_UNKNOWN_METHOD              "org.jackaudio.Error.UnknownMethod"
 #define JACK_DBUS_ERROR_SERVER_NOT_RUNNING          "org.jackaudio.Error.ServerNotRunning"
+#define JACK_DBUS_ERROR_SERVER_RUNNING              "org.jackaudio.Error.ServerRunning"
 #define JACK_DBUS_ERROR_UNKNOWN_DRIVER              "org.jackaudio.Error.UnknownDriver"
 #define JACK_DBUS_ERROR_UNKNOWN_INTERNAL            "org.jackaudio.Error.UnknownInternal"
 #define JACK_DBUS_ERROR_UNKNOWN_PARAMETER           "org.jackaudio.Error.UnknownParameter"

example-clients/jack_control

@@ -116,6 +116,8 @@ def main():
         print "    dp                         - get parameters of currently selected driver"
         print "    dpd <param>                - get long description for driver parameter"
         print "    dps <param> <value>        - set driver parameter"
+        print "    asd <driver>               - add slave driver"
+        print "    rsd <driver>               - remove slave driver"
         print "    il                         - get list of available internals"
         print "    ip <name>                  - get parameters of given internal"
         print "    ipd <name> <param>         - get long description for internal parameter"
@@ -305,6 +307,26 @@ def main():
                 name = sys.argv[index]
                 index += 1
                 result = control_iface.UnloadInternal(name)
+            elif arg == 'asd':
+                print "--- add slave driver"
+
+                if index >= len(sys.argv):
+                    print "add slave driver command requires driver name argument"
+                    sys.exit()
+
+                name = sys.argv[index]
+                index += 1
+                result = control_iface.AddSlaveDriver(name)
+            elif arg == 'rsd':
+                print "--- remove slave driver"
+
+                if index >= len(sys.argv):
+                    print "remove slave driver command requires driver name argument"
+                    sys.exit()
+
+                name = sys.argv[index]
+                index += 1
+                result = control_iface.RemoveSlaveDriver(name)
             else:
                 print "Unknown command '%s'" % arg
         except dbus.DBusException, e:

example-clients/midi_latency_test.c

@@ -60,10 +60,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 #ifdef WIN32
 #include <windows.h>
+#include <unistd.h>
 #else
 #include <semaphore.h>
 #endif
 
+#include <signal.h>
+
 #define ABS(x) (((x) >= 0) ? (x) : (-(x)))
 
 #ifdef WIN32
@@ -115,6 +118,13 @@ jack_time_t total_latency_time;
 size_t unexpected_messages;
 size_t xrun_count;
 
+static void signal_handler(int sig)
+{
+	jack_client_close(client);
+	fprintf(stderr, "signal received, exiting ...\n");
+	exit(0);
+}
+
 #ifdef WIN32
 char semaphore_error_msg[1024];
 #endif
@@ -463,6 +473,7 @@ main(int argc, char **argv)
     program_name = argv[0];
     samples = 1024;
     timeout = 5;
+
     for (;;) {
         char c = getopt_long(argc, argv, option_string, long_options,
                              &long_index);
@@ -554,6 +565,19 @@ main(int argc, char **argv)
                (message_size - 2) * sizeof(jack_midi_data_t));
         message_2[message_size - 1] = 0xf7;
     }
+
+    /* install a signal handler to properly quits jack client */
+#ifdef WIN32
+	signal(SIGINT, signal_handler);
+    signal(SIGABRT, signal_handler);
+	signal(SIGTERM, signal_handler);
+#else
+	signal(SIGQUIT, signal_handler);
+	signal(SIGTERM, signal_handler);
+	signal(SIGHUP, signal_handler);
+	signal(SIGINT, signal_handler);
+#endif
+
     client = jack_client_open(program_name, JackNullOption, NULL);
     if (client == NULL) {
         error_message = "failed to open JACK client";

tests/test.cpp

@@ -745,7 +745,9 @@ int main (int argc, char *argv[])
     }
 
     jack_on_shutdown(client1, jack_shutdown, 0);
-    jack_on_info_shutdown(client1, jack_info_shutdown, 0);
+
+    if (jack_on_info_shutdown)
+        jack_on_info_shutdown(client1, jack_info_shutdown, 0);
 
     if (jack_set_buffer_size_callback(client1, Jack_Update_Buffer_Size, 0) != 0) {
         printf("Error when calling buffer_size_callback !\n");

windows/Setup/jack64.ci

@@ -0,0 +1,142 @@
+<*project
+      version = 4 civer = "Free v4.14.5" winver = "2.6/5.1.2600" >
+   <output> .</>
+   <exename> Jack_v1.9.8_64_setup.exe</>
+   <digitsign> </>
+   <appname> Jack v1.9.8</>
+   <password> </>
+   <addlang> </>
+   <icon> Default - 2</>
+   <selfextr> 1</>
+   <voltype> nolimit</>
+   <volsize> </>
+   <volpattern> disk%i.pak</>
+   <load> </>
+   <loadtime> 1000</>
+   <checktype> admin</>
+   <chkname> </>
+   <chkmsg> </>
+   <dlgfont> Verdana,8</>
+   <lang> English</>
+   <theme> Green</>
+   <iface> leftlogo</>
+   <leftlogo> .\src\logo_installer.bmp</>
+   <logo> </>
+   <vb> </>
+   <dao> </>
+   <background> 0</>
+   <dlgwelcome> 1</>
+   <dlgreadme> .\src\README</>
+   <dlglic> .\src\gpl_installer.rtf</>
+   <dlgcustpath> </>
+   <dlgenfpath> 0</>
+   <dlgsavepath> 1</>
+   <dlgautoprog> 1</>
+   <dlgfinish> 1</>
+   <comptype> defnorm</>
+   <solid> 0</>
+   <srcfolder> </>
+   <ifexist> over</>
+   <runafter> </>
+   <runconfirm> 1</>
+   <uninclude> 1</>
+   <unicon> Uninstall - 2</>
+   <unshortcut> 1</>
+   <unrun> </>
+   <silent> 0</>
+   <unfeed> </>
+   <unautoclose> 1</>
+   <unfinish> 1</>
+   <bl> My Demo</>
+   <blurl> </>
+   <bghead> </>
+   <bgfoot> </>
+   <bgback> </>
+   <files listview >
+      <_><src>..\Release64\bin\libjack64.a</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
+<_><src>.\src\vcredist_x86.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\libjack64.lib</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\libjack64.def</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\libjackserver64.a</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\libjackserver64.lib</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\libjackserver64.def</><dest>inst</><custom>lib</><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</></>
+<_><src>..\Release64\bin\jack_lsp.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\jack_metro.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\jack_unload.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\jackd.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\libjack64.dll</><dest>sys</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\libjackserver64.dll</><dest>sys</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\libsamplerate-0-x86_64.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\portaudio_x86_64.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\jack\jack_net.dll</><dest>inst</><custom>jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\jack\jack_netone.dll</><dest>inst</><custom>jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\jack_netsource.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\jack\jack_dummy.dll</><dest>inst</><custom>jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\jack\jack_loopback.dll</><dest>inst</><custom>jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\jack\jack_winmme.dll</><dest>inst</><custom>jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\jack\jack_portaudio.dll</><dest>inst</><custom>jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\jack\netmanager.dll</><dest>inst</><custom>jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\jack\audioadapter.dll</><dest>inst</><custom>jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\jack\netadapter.dll</><dest>inst</><custom>jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\..\common\jack\control.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\..\common\jack\intclient.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\..\common\jack\jack.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\..\common\jack\jslist.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\..\common\jack\midiport.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\..\common\jack\ringbuffer.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\..\common\jack\statistics.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
+<_><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>..\..\common\jack\weakjack.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>1</></>
+<_><src>..\..\common\jack\weakmacros.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>1</></>
+<_><src>.\JackRouter64.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</></>
+<_><src>.\qjackctl\qjackctl.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>.\qjackctl\QtCore4.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>.\qjackctl\QtGui4.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>.\qjackctl\QtXml4.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>.\src\COPYING</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>.\src\README</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+
+   </files>
+   <runx listview >
+<_><type>app</><path>inst</><file>vcredist_x86.exe</><cmdline></><wait>1</><workdir>inst</><custdir></><when>end</></>
+
+   </runx>
+   <registry listview >
+
+   </registry>
+   <shcut listview >
+<_><shpath>prog</><shname>Jack NetDriver</><tarpath>inst</><tarname>jackd.exe</><cmdline>-R -S -d net</><workpath>inst</><workcust></><icon></></>
+<_><shpath>prog</><shname>Jack Portaudio</><tarpath>inst</><tarname>jackd.exe</><cmdline>-R -S -d portaudio</><workpath>inst</><workcust></><icon></></>
+<_><shpath>prog</><shname>Jack Control</><tarpath>inst</><tarname>qjackctl.exe</><cmdline></><workpath>inst</><workcust></><icon>jackdmp.exe</></>
+<_><shpath>prog</><shname>Jack Command</><tarpath>sys</><tarname>cmd.exe</><cmdline></><workpath>inst</><workcust></><icon></></>
+
+   </shcut>
+   <ini listview >
+
+   </ini>
+   <copy listview >
+
+   </copy>
+   <activex listview >
+      <_><path>inst</><name>JackRouter64.dll</></>
+
+   </activex>
+   <font listview >
+
+   </font>
+   <ext listview >
+
+   </ext>
+   <mreg listview >
+
+   </mreg>
+   <macros> Pathadd=</>
+</project>

windows/jack_audioadapter.cbp

@@ -1,112 +1,203 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="jack_audioadapter" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Win32 Release">
-				<Option output="Release\bin\jack\audioadapter" 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="-D__SMP__" />
-					<Add option="-DSERVER_SIDE" />
-					<Add directory="..\windows" />
-					<Add directory="..\common\jack" />
-					<Add directory="..\common" />
-					<Add directory="portaudio" />
-				</Compiler>
-				<Linker>
-					<Add directory="Release\bin" />
-				</Linker>
-			</Target>
-			<Target title="Win32 Debug">
-				<Option output="Debug\bin\jack\audioadapter" 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="-D__SMP__" />
-					<Add option="-DSERVER_SIDE" />
-					<Add directory="..\windows" />
-					<Add directory="..\common\jack" />
-					<Add directory="..\common" />
-					<Add directory="portaudio" />
-				</Compiler>
-				<Linker>
-					<Add directory="Debug\bin" />
-				</Linker>
-			</Target>
-			<Target title="Win32 Profiling">
-				<Option output="Release\bin\jack\audioadapter" 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="-D__SMP__" />
-					<Add option="-DJACK_MONITOR" />
-					<Add option="-DSERVER_SIDE" />
-					<Add directory="..\windows" />
-					<Add directory="..\common\jack" />
-					<Add directory="..\common" />
-					<Add directory="portaudio" />
-				</Compiler>
-				<Linker>
-					<Add directory="Release\bin" />
-				</Linker>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-Wall" />
-		</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="libsamplerate-0" />
-			<Add library="libjackserver" />
-			<Add library="portaudio_x86" />
-		</Linker>
-		<Unit filename="..\common\JackAudioAdapter.cpp" />
-		<Unit filename="..\common\JackAudioAdapterFactory.cpp" />
-		<Unit filename="..\common\JackAudioAdapterInterface.cpp" />
-		<Unit filename="..\common\JackLibSampleRateResampler.cpp" />
-		<Unit filename="..\common\JackResampler.cpp" />
-		<Unit filename="jackaudioadapter.rc">
-			<Option compilerVar="WINDRES" />
-		</Unit>
-		<Unit filename="portaudio\JackPortAudioAdapter.cpp" />
-		<Unit filename="portaudio\JackPortAudioDevices.cpp" />
-		<Extensions>
-			<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>
-			<code_completion />
-			<envvars />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+	<FileVersion major="1" minor="6" />
+	<Project>
+		<Option title="jack_audioadapter" />
+		<Option pch_mode="2" />
+		<Option compiler="mingw_64" />
+		<Build>
+			<Target title="Win32 Release 64bits">
+				<Option output="Release64\bin\jack\audioadapter" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64\" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<Compiler>
+					<Add option="-O2" />
+					<Add option="-Wall" />
+					<Add option="-DBUILD_DLL" />
+					<Add option="-D__SMP__" />
+					<Add option="-DSERVER_SIDE" />
+					<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 directory="Release64\bin" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Debug 64bits">
+				<Option output="Debug64\bin\jack\audioadapter" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Debug64\" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<Compiler>
+					<Add option="-Wall" />
+					<Add option="-g" />
+					<Add option="-DBUILD_DLL" />
+					<Add option="-D__SMP__" />
+					<Add option="-DSERVER_SIDE" />
+					<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 directory="Debug64\bin" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Profiling 64bits">
+				<Option output="Release64\bin\jack\audioadapter" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64\" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<Compiler>
+					<Add option="-O2" />
+					<Add option="-Wall" />
+					<Add option="-DBUILD_DLL" />
+					<Add option="-D__SMP__" />
+					<Add option="-DJACK_MONITOR" />
+					<Add option="-DSERVER_SIDE" />
+					<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 directory="Release64\bin" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Release 32bits">
+				<Option output="Release\bin\jack\audioadapter" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release\" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<Compiler>
+					<Add option="-O2" />
+					<Add option="-Wall" />
+					<Add option="-m32" />
+					<Add option="-DBUILD_DLL" />
+					<Add option="-D__SMP__" />
+					<Add option="-DSERVER_SIDE" />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+					<Add directory="portaudio" />
+				</Compiler>
+				<Linker>
+					<Add option="-m32" />
+					<Add library="libsamplerate-0" />
+					<Add library="libjackserver" />
+					<Add library="portaudio_x86" />
+					<Add directory="Release\bin" />
+				</Linker>
+				<ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Release/jackaudioadapter.res jackaudioadapter.rc" />
+				</ExtraCommands>
+			</Target>
+			<Target title="Win32 Debug 32bits">
+				<Option output="Debug\bin\jack\audioadapter" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Debug\" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<Compiler>
+					<Add option="-Wall" />
+					<Add option="-g" />
+					<Add option="-m32" />
+					<Add option="-DBUILD_DLL" />
+					<Add option="-D__SMP__" />
+					<Add option="-DSERVER_SIDE" />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+					<Add directory="portaudio" />
+				</Compiler>
+				<Linker>
+					<Add option="-m32" />
+					<Add library="libsamplerate-0" />
+					<Add library="libjackserver" />
+					<Add library="portaudio_x86" />
+					<Add directory="Debug\bin" />
+				</Linker>
+				<ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Debug/jackaudioadapter.res jackaudioadapter.rc" />
+				</ExtraCommands>
+			</Target>
+			<Target title="Win32 Profiling 32bits">
+				<Option output="Release\bin\jack\audioadapter" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release\" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<Compiler>
+					<Add option="-O2" />
+					<Add option="-Wall" />
+					<Add option="-m32" />
+					<Add option="-DBUILD_DLL" />
+					<Add option="-D__SMP__" />
+					<Add option="-DJACK_MONITOR" />
+					<Add option="-DSERVER_SIDE" />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+					<Add directory="portaudio" />
+				</Compiler>
+				<Linker>
+					<Add option="-m32" />
+					<Add library="libsamplerate-0" />
+					<Add library="libjackserver" />
+					<Add library="portaudio_x86" />
+					<Add directory="Release\bin" />
+				</Linker>
+				<ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Release/jackaudioadapter.res jackaudioadapter.rc" />
+				</ExtraCommands>
+			</Target>
+		</Build>
+		<Compiler>
+			<Add option="-Wall" />
+		</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" />
+		</Linker>
+		<Unit filename="..\common\JackAudioAdapter.cpp" />
+		<Unit filename="..\common\JackAudioAdapterFactory.cpp" />
+		<Unit filename="..\common\JackAudioAdapterInterface.cpp" />
+		<Unit filename="..\common\JackLibSampleRateResampler.cpp" />
+		<Unit filename="..\common\JackResampler.cpp" />
+		<Unit filename="jackaudioadapter.rc">
+			<Option compilerVar="WINDRES" />
+		</Unit>
+		<Unit filename="portaudio\JackPortAudioAdapter.cpp" />
+		<Unit filename="portaudio\JackPortAudioDevices.cpp" />
+		<Extensions>
+			<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>
+			<code_completion />
+			<envvars />
+			<debugger />
+		</Extensions>
+	</Project>
+</CodeBlocks_project_file>

windows/jack_connect.cbp

@@ -4,50 +4,112 @@
 	<Project>
 		<Option title="jack_connect" />
 		<Option pch_mode="2" />
-		<Option compiler="gcc" />
+		<Option compiler="mingw_64" />
 		<Build>
-			<Target title="Win32 Release">
+			<Target title="Win32 Release 64bits">
+				<Option output="Release64\bin\jack_connect" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64\" />
+				<Option type="1" />
+				<Option compiler="mingw_64" />
+				<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="Release64\bin" />
+                    <Add library="libjack64" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Debug 64bits">
+				<Option output="Debug64\bin\jack_connect" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Debug64\" />
+				<Option type="1" />
+				<Option compiler="mingw_64" />
+				<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="Release\bin64" />
+                    <Add library="libjack64" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Profiling 64bits">
+				<Option output="Release64\bin\jack_connect" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64\" />
+				<Option type="1" />
+				<Option compiler="mingw_64" />
+				<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="Release64\bin" />
+                    <Add library="libjack64" />
+				</Linker>
+			</Target>
+            <Target title="Win32 Release 32bits">
 				<Option output="Release\bin\jack_connect" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="1" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+                    <Add option="-m32" />
 					<Add directory="..\example-clients" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+                    <Add option="-m32" />
 					<Add directory="Release\bin" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
-			<Target title="Win32 Debug">
+			<Target title="Win32 Debug 32bits">
 				<Option output="Debug\bin\jack_connect" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug\" />
 				<Option type="1" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-Wall" />
 					<Add option="-g" />
+                    <Add option="-m32" />
 					<Add directory="..\example-clients" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+                    <Add option="-m32" />
 					<Add directory="Release\bin" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
-			<Target title="Win32 Profiling">
+			<Target title="Win32 Profiling 32bits">
 				<Option output="Release\bin\jack_connect" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="1" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+                    <Add option="-m32" />
 					<Add option="-DJACK_MONITOR" />
 					<Add directory="..\example-clients" />
 					<Add directory="..\windows" />
@@ -55,7 +117,9 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+                    <Add option="-m32" />
 					<Add directory="Release\bin" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 		</Build>
@@ -75,7 +139,6 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjack" />
 		</Linker>
 		<Unit filename="..\example-clients\connect.c">
 			<Option compilerVar="CC" />

windows/jack_disconnect.cbp

@@ -4,50 +4,112 @@
 	<Project>
 		<Option title="jack_disconnect" />
 		<Option pch_mode="2" />
-		<Option compiler="gcc" />
+		<Option compiler="mingw_64" />
 		<Build>
-			<Target title="Win32 Release">
+			<Target title="Win32 Release 64bits">
+				<Option output="Release64\bin\jack_disconnect" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64\" />
+				<Option type="1" />
+				<Option compiler="mingw_64" />
+				<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="Release64\bin" />
+                    <Add library="libjack64" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Debug 64bits">
+				<Option output="Debug64\bin\jack_disconnect" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Debug64\" />
+				<Option type="1" />
+				<Option compiler="mingw_64" />
+				<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="Debug64\bin" />
+                    <Add library="libjack64" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Profiling 64bits">
+				<Option output="Release64\bin\jack_disconnect" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64\" />
+				<Option type="1" />
+				<Option compiler="mingw_64" />
+				<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="Release64\bin" />
+                    <Add library="libjack64" />
+				</Linker>
+			</Target>
+            <Target title="Win32 Release 32bits">
 				<Option output="Release\bin\jack_disconnect" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="1" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+                    <Add option="-m32" />
 					<Add directory="..\example-clients" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+                    <Add option="-m32" />
 					<Add directory="Release\bin" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
-			<Target title="Win32 Debug">
+			<Target title="Win32 Debug 32bits">
 				<Option output="Debug\bin\jack_disconnect" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug\" />
 				<Option type="1" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-Wall" />
 					<Add option="-g" />
+                    <Add option="-m32" />
 					<Add directory="..\example-clients" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+                    <Add option="-m32" />
 					<Add directory="Debug\bin" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
-			<Target title="Win32 Profiling">
+			<Target title="Win32 Profiling 32bits">
 				<Option output="Release\bin\jack_disconnect" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="1" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+                    <Add option="-m32" />
 					<Add option="-DJACK_MONITOR" />
 					<Add directory="..\example-clients" />
 					<Add directory="..\windows" />
@@ -55,7 +117,9 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+                    <Add option="-m32" />
 					<Add directory="Release\bin" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 		</Build>
@@ -79,7 +143,6 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjack" />
 		</Linker>
 		<Unit filename="..\example-clients\connect.c">
 			<Option compilerVar="CC" />

windows/jack_dummy.cbp

@@ -4,16 +4,75 @@
 	<Project>
 		<Option title="jack_dummy" />
 		<Option pch_mode="2" />
-		<Option compiler="gcc" />
+		<Option compiler="mingw_64" />
 		<Build>
-			<Target title="Win32 Release">
+			<Target title="Win32 Release 64bits">
+				<Option output="Release64\bin\jack\jack_dummy" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64\" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<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="Release64\bin" />
+                    <Add library="libjackserver64" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Debug 64bits">
+				<Option output="Debug64\bin\jack\jack_dummy" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Debug64\" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<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="Debug64\bin" />
+                    <Add library="libjackserver64" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Profiling 64bits">
+				<Option output="Release64\bin\jack\jack_dummy" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64\" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<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="Release64\bin" />
+                    <Add library="libjackserver64" />
+				</Linker>
+			</Target>
+            <Target title="Win32 Release 32bits">
 				<Option output="Release\bin\jack\jack_dummy" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="3" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+                    <Add option="-m32" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
 					<Add directory="..\windows" />
@@ -21,17 +80,23 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+                    <Add option="-m32" />
 					<Add directory="Release\bin" />
+                    <Add library="libjackserver" />
 				</Linker>
+                <ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Release/jackdummydriver.res jackdummydriver.rc" />
+				</ExtraCommands>
 			</Target>
-			<Target title="Win32 Debug">
+			<Target title="Win32 Debug 32bits">
 				<Option output="Debug\bin\jack\jack_dummy" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug\" />
 				<Option type="3" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-Wall" />
 					<Add option="-g" />
+                    <Add option="-m32" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
 					<Add directory="..\windows" />
@@ -39,17 +104,23 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+                    <Add option="-m32" />
 					<Add directory="Debug\bin" />
+                    <Add library="libjackserver" />
 				</Linker>
+                <ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Debug/jackdummydriver.res jackdummydriver.rc" />
+				</ExtraCommands>
 			</Target>
-			<Target title="Win32 Profiling">
+			<Target title="Win32 Profiling 32bits">
 				<Option output="Release\bin\jack\jack_dummy" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="3" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+                    <Add option="-m32" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DSERVER_SIDE" />
@@ -58,8 +129,13 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+                    <Add option="-m32" />
 					<Add directory="Release\bin" />
+                    <Add library="libjackserver" />
 				</Linker>
+                <ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Release/jackdummydriver.res jackdummydriver.rc" />
+				</ExtraCommands>
 			</Target>
 		</Build>
 		<Compiler>
@@ -78,8 +154,7 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjackserver" />
-		</Linker>
+        </Linker>
 		<Unit filename="jackdummydriver.rc">
 			<Option compilerVar="WINDRES" />
 		</Unit>

windows/jack_latent_client.cbp

@@ -4,56 +4,118 @@
 	<Project>
 		<Option title="jack_latent_client" />
 		<Option pch_mode="2" />
-		<Option compiler="gcc" />
+		<Option compiler="mingw_64" />
 		<Build>
-			<Target title="Win32 Release">
+			<Target title="Win32 Release 64bits">
+				<Option output="Release64\bin\jack_latent_client" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64\" />
+				<Option type="1" />
+				<Option compiler="mingw_64" />
+				<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="Release64\bin" />
+                    <Add library="libjack64" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Debug 64bits">
+				<Option output="Debug64\bin\jack_latent_client" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Debug64\" />
+				<Option type="1" />
+				<Option compiler="mingw_64" />
+				<Compiler>
+					<Add option="-g" />
+					<Add directory="..\example-clients" />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+				</Compiler>
+				<Linker>
+					<Add directory="Debug\bin64" />
+                    <Add library="libjack64" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Profiling 64bits">
+				<Option output="Release64\bin\jack_latent_client" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64\" />
+				<Option type="1" />
+				<Option compiler="mingw_64" />
+				<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="Release64\bin" />
+                    <Add library="libjack64" />
+				</Linker>
+			</Target>
+            <Target title="Win32 Release 32bits">
 				<Option output="Release\bin\jack_latent_client" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="1" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+                    <Add option="-m32" />
 					<Add directory="..\example-clients" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+                    <Add option="-m32" />
 					<Add directory="Release\bin" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
-			<Target title="Win32 Debug">
+			<Target title="Win32 Debug 32bits">
 				<Option output="Debug\bin\jack_latent_client" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug\" />
 				<Option type="1" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-g" />
+                    <Add option="-m32" />
 					<Add directory="..\example-clients" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+                    <Add option="-m32" />
 					<Add directory="Debug\bin" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
-			<Target title="Win32 Profiling">
+			<Target title="Win32 Profiling 32bits">
 				<Option output="Release\bin\jack_latent_client" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="1" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+                    <Add option="-m32" />
 					<Add directory="..\example-clients" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+                    <Add option="-m32" />
 					<Add directory="Release\bin" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 		</Build>
@@ -72,7 +134,6 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjack" />
 		</Linker>
 		<Unit filename="..\example-clients\latent_client.c">
 			<Option compilerVar="CC" />

windows/jack_load.cbp

@@ -4,49 +4,110 @@
 	<Project>
 		<Option title="jack_load" />
 		<Option pch_mode="2" />
-		<Option compiler="gcc" />
+		<Option compiler="mingw_64" />
 		<Build>
-			<Target title="Win32 Release">
+			<Target title="Win32 Release 64bits">
+				<Option output="Release64\bin\jack_load" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64\" />
+				<Option type="1" />
+				<Option compiler="mingw_64" />
+				<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="Release64\bin" />
+                    <Add library="libjack64" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Debug 64bits">
+				<Option output="Debug64\bin\jack_load" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Debug64\" />
+				<Option type="1" />
+				<Option compiler="mingw_64" />
+				<Compiler>
+					<Add option="-g" />
+					<Add directory="..\example-clients" />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+				</Compiler>
+				<Linker>
+					<Add directory="Debug64\bin" />
+                    <Add library="libjack64" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Profiling 64bits">
+				<Option output="Release64\bin\jack_load" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64\" />
+				<Option type="1" />
+				<Option compiler="mingw_64" />
+				<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="Release64\bin" />
+                    <Add library="libjack64" />
+				</Linker>
+			</Target>
+            <Target title="Win32 Release 32bits">
 				<Option output="Release\bin\jack_load" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="1" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+                    <Add option="-m32" />
 					<Add directory="..\example-clients" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+                    <Add option="-m32" />
 					<Add directory="Release\bin" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
-			<Target title="Win32 Debug">
+			<Target title="Win32 Debug 32bits">
 				<Option output="Debug\bin\jack_load" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug\" />
 				<Option type="1" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-g" />
+                    <Add option="-m32" />
 					<Add directory="..\example-clients" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+                    <Add option="-m32" />
 					<Add directory="Debug\bin" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
-			<Target title="Win32 Profiling">
+			<Target title="Win32 Profiling 32bits">
 				<Option output="Release\bin\jack_load" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="1" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+                    <Add option="-m32" />
 					<Add option="-DJACK_MONITOR" />
 					<Add directory="..\example-clients" />
 					<Add directory="..\windows" />
@@ -54,7 +115,9 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+                    <Add option="-m32" />
 					<Add directory="Release\bin" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 		</Build>
@@ -74,7 +137,6 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjack" />
 		</Linker>
 		<Unit filename="..\example-clients\ipload.c">
 			<Option compilerVar="CC" />

windows/jack_loopback.cbp

@@ -4,16 +4,75 @@
 	<Project>
 		<Option title="jack_loopback" />
 		<Option pch_mode="2" />
-		<Option compiler="gcc" />
+		<Option compiler="mingw_64" />
 		<Build>
-			<Target title="Win32 Release">
+			<Target title="Win32 Release 64bits">
+				<Option output="Release64\bin\jack\jack_loopback" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64\" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<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="Release64\bin" />
+                    <Add library="libjackserver64" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Debug 64bits">
+				<Option output="Debug64\bin\jack\jack_loopback" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Debug64\" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<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="Debug64\bin" />
+                    <Add library="libjackserver64" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Profiling 64bits">
+				<Option output="Release64\bin\jack\jack_loopback" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64\" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<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="Release64\bin" />
+                    <Add library="libjackserver64" />
+				</Linker>
+			</Target>
+            <Target title="Win32 Release 32bits">
 				<Option output="Release\bin\jack\jack_loopback" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="3" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+                    <Add option="-m32" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
 					<Add directory="..\windows" />
@@ -21,17 +80,23 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+                    <Add option="-m32" />
 					<Add directory="Release\bin" />
+                    <Add library="libjackserver" />
 				</Linker>
+                <ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Release/jackloopbackdriver.res jackloopbackdriver.rc" />
+				</ExtraCommands>
 			</Target>
-			<Target title="Win32 Debug">
+			<Target title="Win32 Debug 32bits">
 				<Option output="Debug\bin\jack\jack_loopback" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug\" />
 				<Option type="3" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-Wall" />
 					<Add option="-g" />
+                    <Add option="-m32" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
 					<Add directory="..\windows" />
@@ -39,17 +104,23 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+                    <Add option="-m32" />
 					<Add directory="Debug\bin" />
+                    <Add library="libjackserver" />
 				</Linker>
+                <ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Debug/jackloopbackdriver.res jackloopbackdriver.rc" />
+				</ExtraCommands>
 			</Target>
-			<Target title="Win32 Profiling">
+			<Target title="Win32 Profiling 32bits">
 				<Option output="Release\bin\jack\jack_loopback" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="3" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+                    <Add option="-m32" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DSERVER_SIDE" />
@@ -58,8 +129,13 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+                    <Add option="-m32" />
 					<Add directory="Release\bin" />
+                    <Add library="libjackserver" />
 				</Linker>
+                <ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Release/jackloopbackdriver.res jackloopbackdriver.rc" />
+				</ExtraCommands>
 			</Target>
 		</Build>
 		<Compiler>
@@ -78,7 +154,6 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjackserver" />
 		</Linker>
 		<Unit filename="jackloopbackdriver.rc">
 			<Option compilerVar="WINDRES" />

windows/jack_lsp.cbp

@@ -4,55 +4,117 @@
 	<Project>
 		<Option title="jack_lsp" />
 		<Option pch_mode="2" />
-		<Option compiler="gcc" />
+		<Option compiler="mingw_64" />
 		<Build>
-			<Target title="Win32 Release">
+			<Target title="Win32 Release 64bits">
+				<Option output="Release64\bin\jack_lsp" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64\" />
+				<Option type="1" />
+				<Option compiler="mingw_64" />
+				<Compiler>
+					<Add option="-O2" />
+					<Add option="-Wall" />
+					<Add directory="..\example-clients" />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+				</Compiler>
+				<Linker>
+					<Add library="libjack64" />
+					<Add directory="Release64\bin" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Debug 64bits">
+				<Option output="Debug64\bin\jack_lsp" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Debug64\" />
+				<Option type="1" />
+				<Option compiler="mingw_64" />
+				<Compiler>
+					<Add option="-g" />
+					<Add directory="..\example-clients" />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+				</Compiler>
+				<Linker>
+					<Add library="libjack64" />
+					<Add directory="Debug64\bin" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Profiling 64bits">
+				<Option output="Release64\bin\jack_lsp" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64\" />
+				<Option type="1" />
+				<Option compiler="mingw_64" />
+				<Compiler>
+					<Add option="-O2" />
+					<Add option="-Wall" />
+					<Add directory="..\example-clients" />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+				</Compiler>
+				<Linker>
+					<Add library="libjack64" />
+					<Add directory="Release64\bin" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Release 32bits">
 				<Option output="Release\bin\jack_lsp" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="1" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+					<Add option="-m32" />
 					<Add directory="..\example-clients" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+					<Add option="-m32" />
+					<Add library="libjack" />
 					<Add directory="Release\bin" />
 				</Linker>
 			</Target>
-			<Target title="Win32 Debug">
+			<Target title="Win32 Debug 32bits">
 				<Option output="Debug\bin\jack_lsp" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug\" />
 				<Option type="1" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-g" />
+					<Add option="-m32" />
 					<Add directory="..\example-clients" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+					<Add option="-m32" />
+					<Add library="libjack" />
 					<Add directory="Debug\bin" />
 				</Linker>
 			</Target>
-			<Target title="Win32 Profiling">
+			<Target title="Win32 Profiling 32bits">
 				<Option output="Release\bin\jack_lsp" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="1" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+					<Add option="-m32" />
 					<Add directory="..\example-clients" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+					<Add option="-m32" />
+					<Add library="libjack" />
 					<Add directory="Release\bin" />
 				</Linker>
 			</Target>
@@ -72,7 +134,6 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjack" />
 		</Linker>
 		<Unit filename="..\example-clients\lsp.c">
 			<Option compilerVar="CC" />

windows/jack_metro.cbp

@@ -4,16 +4,72 @@
 	<Project>
 		<Option title="jack_metro" />
 		<Option pch_mode="2" />
-		<Option compiler="gcc" />
+		<Option compiler="mingw_64" />
 		<Build>
-			<Target title="Win32 Release">
+			<Target title="Win32 Release 64bits">
+				<Option output="Release64\bin\jack_metro" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64\" />
+				<Option type="1" />
+				<Option compiler="mingw_64" />
+				<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="Release64\bin" />
+                    <Add library="libjack64" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Debug 64bits">
+				<Option output="Debug64\bin\jack_metro" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Debug64\" />
+				<Option type="1" />
+				<Option compiler="mingw_64" />
+				<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="Debug64\bin" />
+                    <Add library="libjack64" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Profiling 64bits">
+				<Option output="Release64\bin\jack_metro" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64\" />
+				<Option type="1" />
+				<Option compiler="mingw_64" />
+				<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="Release64\bin" />
+                    <Add library="libjack64" />
+				</Linker>
+			</Target>
+            <Target title="Win32 Release 32bits">
 				<Option output="Release\bin\jack_metro" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="1" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+                    <Add option="-m32" />
 					<Add directory="..\example-clients" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
@@ -21,16 +77,19 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
+                    <Add option="-m32" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
-			<Target title="Win32 Debug">
+			<Target title="Win32 Debug 32bits">
 				<Option output="Debug\bin\jack_metro" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug\" />
 				<Option type="1" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-Wall" />
 					<Add option="-g" />
+                    <Add option="-m32" />
 					<Add directory="..\example-clients" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
@@ -38,16 +97,19 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin" />
+                    <Add option="-m32" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
-			<Target title="Win32 Profiling">
+			<Target title="Win32 Profiling 32bits">
 				<Option output="Release\bin\jack_metro" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="1" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+                    <Add option="-m32" />
 					<Add option="-DJACK_MONITOR" />
 					<Add directory="..\example-clients" />
 					<Add directory="..\windows" />
@@ -56,6 +118,8 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
+                    <Add option="-m32" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 		</Build>
@@ -75,7 +139,6 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjack" />
 		</Linker>
 		<Unit filename="..\example-clients\metro.c">
 			<Option compilerVar="CC" />

windows/jack_netadapter.cbp

@@ -4,16 +4,78 @@
 	<Project>
 		<Option title="jack_netadapter" />
 		<Option pch_mode="2" />
-		<Option compiler="gcc" />
+		<Option compiler="mingw_64" />
 		<Build>
-			<Target title="Win32 Release">
+			<Target title="Win32 Release 64bits">
+				<Option output="Release64\bin\jack\netadapter" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64\" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<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 library="libjackserver64" />
+					<Add library="libsamplerate_x86_64" />
+					<Add directory="Release64\bin" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Debug 64bits">
+				<Option output="Debug64\bin\jack\netadapter" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Debug64\" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<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 library="libjackserver64" />
+					<Add library="libsamplerate_x86_64" />
+					<Add directory="Debug64\bin" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Profiling 64bits">
+				<Option output="Release64\bin\jack\netadapter" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64\" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<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 library="libjackserver64" />
+					<Add library="libsamplerate_x86_64" />
+					<Add directory="Release64\bin" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Release 32bits">
 				<Option output="Release\bin\jack\netadapter" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="3" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+					<Add option="-m32" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
 					<Add directory="..\windows" />
@@ -21,17 +83,24 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+					<Add option="-m32" />
+					<Add library="libjackserver" />
+					<Add library="libsamplerate-0" />
 					<Add directory="Release\bin" />
 				</Linker>
+				<ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Release/jacknetadapter.res jacknetadapter.rc" />
+				</ExtraCommands>
 			</Target>
-			<Target title="Win32 Debug">
+			<Target title="Win32 Debug 32bits">
 				<Option output="Debug\bin\jack\netadapter" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug\" />
 				<Option type="3" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-Wall" />
 					<Add option="-g" />
+					<Add option="-m32" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
 					<Add directory="..\windows" />
@@ -39,17 +108,24 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+					<Add option="-m32" />
+					<Add library="libjackserver" />
+					<Add library="libsamplerate-0" />
 					<Add directory="Debug\bin" />
 				</Linker>
+				<ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Debug/jacknetadapter.res jacknetadapter.rc" />
+				</ExtraCommands>
 			</Target>
-			<Target title="Win32 Profiling">
+			<Target title="Win32 Profiling 32bits">
 				<Option output="Release\bin\jack\netadapter" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="3" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+					<Add option="-m32" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DSERVER_SIDE" />
@@ -58,8 +134,14 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+					<Add option="-m32" />
+					<Add library="libjackserver" />
+					<Add library="libsamplerate-0" />
 					<Add directory="Release\bin" />
 				</Linker>
+				<ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Release/jacknetadapter.res jacknetadapter.rc" />
+				</ExtraCommands>
 			</Target>
 		</Build>
 		<Compiler>
@@ -82,9 +164,6 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjackserver" />
-			<Add library="libsamplerate-0" />
-			<Add directory="Release\bin" />
 		</Linker>
 		<Unit filename="..\common\JackAudioAdapter.cpp" />
 		<Unit filename="..\common\JackAudioAdapterInterface.cpp" />

windows/jack_netdriver.cbp

@@ -4,16 +4,75 @@
 	<Project>
 		<Option title="jack_netdriver" />
 		<Option pch_mode="2" />
-		<Option compiler="gcc" />
+		<Option compiler="mingw_64" />
 		<Build>
-			<Target title="Win32 Release">
+			<Target title="Win32 Release 64bits">
+				<Option output="Release64\bin\jack\jack_net" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64\" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<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="Release64\bin" />
+                    <Add library="libjackserver64" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Debug 64bits">
+				<Option output="Debug64\bin\jack\jack_net" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Debug64\" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<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="Debug64\bin" />
+                    <Add library="libjackserver64" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Profiling 64bits">
+				<Option output="Release64\bin\jack\jack_net" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64\" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<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="Release64\bin" />
+                    <Add library="libjackserver64" />
+				</Linker>
+			</Target>
+            <Target title="Win32 Release 32bits">
 				<Option output="Release\bin\jack\jack_net" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="3" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+                    <Add option="-m32" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
 					<Add directory="..\windows" />
@@ -22,16 +81,22 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
+                    <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
+                <ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Release/jacknetdriver.res jacknetdriver.rc" />
+				</ExtraCommands>
 			</Target>
-			<Target title="Win32 Debug">
+			<Target title="Win32 Debug 32bits">
 				<Option output="Debug\bin\jack\jack_net" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug\" />
 				<Option type="3" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-Wall" />
 					<Add option="-g" />
+                    <Add option="-m32" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
 					<Add directory="..\windows" />
@@ -40,16 +105,22 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin" />
+                    <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
+                 <ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Debug/jacknetdriver.res jacknetdriver.rc" />
+				</ExtraCommands>
 			</Target>
-			<Target title="Win32 Profiling">
+			<Target title="Win32 Profiling 32bits">
 				<Option output="Release\bin\jack\jack_net" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="3" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+                    <Add option="-m32" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DSERVER_SIDE" />
@@ -59,7 +130,12 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
+                    <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
+                 <ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Release/jacknetdriver.res jacknetdriver.rc" />
+				</ExtraCommands>
 			</Target>
 		</Build>
 		<Compiler>
@@ -79,7 +155,6 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjackserver" />
 			<Add library="ws2_32" />
 		</Linker>
 		<Unit filename="..\common\JackNetDriver.cpp" />

windows/jack_netmanager.cbp

@@ -4,16 +4,72 @@
 	<Project>
 		<Option title="jack_netmanager" />
 		<Option pch_mode="2" />
-		<Option compiler="gcc" />
+		<Option compiler="mingw_64" />
 		<Build>
-			<Target title="Win32 Release">
+			<Target title="Win32 Release 64bits">
+				<Option output="Release64\bin\jack\netmanager" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64\" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<Compiler>
+					<Add option="-O2" />
+					<Add option="-Wall" />
+					<Add option="-DSERVER_SIDE" />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+				</Compiler>
+				<Linker>
+					<Add directory="Release64\bin" />
+                    <Add library="libjackserver64" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Debug 64bits">
+				<Option output="Debug64\bin\jack\netmanager" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Debug64\" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<Compiler>
+					<Add option="-Wall" />
+					<Add option="-g" />
+					<Add option="-DSERVER_SIDE" />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+				</Compiler>
+				<Linker>
+					<Add directory="Debug64\bin" />
+                    <Add library="libjackserver64" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Profiling 64bits">
+				<Option output="Release64\bin\jack\netmanager" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64\" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<Compiler>
+					<Add option="-O2" />
+					<Add option="-Wall" />
+					<Add option="-DJACK_MONITOR" />
+					<Add option="-DSERVER_SIDE" />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+				</Compiler>
+				<Linker>
+					<Add directory="Release64\bin" />
+                    <Add library="libjackserver64" />
+				</Linker>
+			</Target>
+            <Target title="Win32 Release 32bits">
 				<Option output="Release\bin\jack\netmanager" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="3" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+                    <Add option="-m32" />
 					<Add option="-DSERVER_SIDE" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
@@ -21,16 +77,22 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
+                    <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
+                <ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Release/jacknetmanager.res jacknetmanager.rc" />
+				</ExtraCommands>
 			</Target>
-			<Target title="Win32 Debug">
+			<Target title="Win32 Debug 32bits">
 				<Option output="Debug\bin\jack\netmanager" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug\" />
 				<Option type="3" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-Wall" />
 					<Add option="-g" />
+                    <Add option="-m32" />
 					<Add option="-DSERVER_SIDE" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
@@ -38,16 +100,22 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin" />
+                    <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
+                <ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Debug/jacknetmanager.res jacknetmanager.rc" />
+				</ExtraCommands>
 			</Target>
-			<Target title="Win32 Profiling">
+			<Target title="Win32 Profiling 32bits">
 				<Option output="Release\bin\jack\netmanager" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="3" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+                    <Add option="-m32" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DSERVER_SIDE" />
 					<Add directory="..\windows" />
@@ -56,7 +124,12 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
+                    <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
+                <ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Release/jacknetmanager.res jacknetmanager.rc" />
+				</ExtraCommands>
 			</Target>
 		</Build>
 		<Compiler>
@@ -77,8 +150,7 @@
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
 			<Add library="ws2_32" />
-			<Add library="libjackserver" />
-		</Linker>
+        </Linker>
 		<Unit filename="..\common\JackNetManager.cpp" />
 		<Unit filename="jacknetmanager.rc">
 			<Option compilerVar="WINDRES" />

windows/jack_netonedriver.cbp

@@ -4,16 +4,75 @@
 	<Project>
 		<Option title="jack_netonedriver" />
 		<Option pch_mode="2" />
-		<Option compiler="gcc" />
+		<Option compiler="mingw_64" />
 		<Build>
-			<Target title="Win32 Release">
+			<Target title="Win32 Release 64bits">
+				<Option output="Release64\bin\jack\jack_netone" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64\" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<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="Release64\bin" />
+                    <Add library="libjackserver64" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Debug 64bits">
+				<Option output="Debug64\bin\jack\jack_netone" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Debug64\" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<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="Debug64\bin" />
+                    <Add library="libjackserver64" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Profiling 64bits">
+				<Option output="Release64\bin\jack\jack_netone" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64\" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<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="Release64\bin" />
+                    <Add library="libjackserver64" />
+				</Linker>
+			</Target>
+            <Target title="Win32 Release 32bits">
 				<Option output="Release\bin\jack\jack_netone" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="3" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+                    <Add option="-m32" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
 					<Add directory="..\windows" />
@@ -22,16 +81,22 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
+                    <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
+                <ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Release/jacknetonedriver.res jacknetonedriver.rc" />
+				</ExtraCommands>
 			</Target>
-			<Target title="Win32 Debug">
+			<Target title="Win32 Debug 32bits">
 				<Option output="Debug\bin\jack\jack_netone" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug\" />
 				<Option type="3" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-Wall" />
 					<Add option="-g" />
+                    <Add option="-m32" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
 					<Add directory="..\windows" />
@@ -40,16 +105,22 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin" />
+                    <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
+                <ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Debug/jacknetonedriver.res jacknetonedriver.rc" />
+				</ExtraCommands>
 			</Target>
-			<Target title="Win32 Profiling">
+			<Target title="Win32 Profiling 32bits">
 				<Option output="Release\bin\jack\jack_netone" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="3" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+                    <Add option="-m32" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DSERVER_SIDE" />
@@ -59,7 +130,12 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
+                    <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
+                <ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Debug/jacknetonedriver.res jacknetonedriver.rc" />
+				</ExtraCommands>
 			</Target>
 		</Build>
 		<Compiler>
@@ -79,7 +155,6 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjackserver" />
 			<Add library="ws2_32" />
 		</Linker>
 		<Unit filename="..\common\JackNetOneDriver.cpp" />

windows/jack_netsource.cbp

@@ -1,110 +1,177 @@
-<?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>
-		<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>
+<?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="mingw_64" />
+		<Build>
+			<Target title="Win32 Release 64bits">
+				<Option output="Release64\bin\jack_netsource" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64\" />
+				<Option type="1" />
+				<Option compiler="mingw_64" />
+				<Compiler>
+					<Add option="-O2" />
+					<Add option="-Wall" />
+					<Add directory="..\example-clients" />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+				</Compiler>
+				<Linker>
+					<Add library="libjack64" />
+					<Add library="libsamplerate_x86_64" />
+					<Add directory="Release64\bin" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Debug 64bits">
+				<Option output="Debug64\bin\jack_netsource" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Debug64\" />
+				<Option type="1" />
+				<Option compiler="mingw_64" />
+				<Compiler>
+					<Add option="-Wall" />
+					<Add option="-g" />
+					<Add directory="..\example-clients" />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+				</Compiler>
+				<Linker>
+					<Add library="libjack64" />
+					<Add library="libsamplerate_x86_64" />
+					<Add directory="Debug64\bin" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Profiling 64bits">
+				<Option output="Release64\bin\jack_netsource" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64\" />
+				<Option type="1" />
+				<Option compiler="mingw_64" />
+				<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 library="libjack64" />
+					<Add library="libsamplerate_x86_64" />
+					<Add directory="Release64\bin" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Release 32bits">
+				<Option output="Release\bin\jack_netsource" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release\" />
+				<Option type="1" />
+				<Option compiler="mingw_64" />
+				<Compiler>
+					<Add option="-O2" />
+					<Add option="-Wall" />
+					<Add option="-m32" />
+					<Add directory="..\example-clients" />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+				</Compiler>
+				<Linker>
+					<Add option="-m32" />
+					<Add library="libjack" />
+					<Add library="libsamplerate-0" />
+					<Add directory="Release\bin" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Debug 32bits">
+				<Option output="Debug\bin\jack_netsource" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Debug\" />
+				<Option type="1" />
+				<Option compiler="mingw_64" />
+				<Compiler>
+					<Add option="-Wall" />
+					<Add option="-g" />
+					<Add option="-m32" />
+					<Add directory="..\example-clients" />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+				</Compiler>
+				<Linker>
+					<Add option="-m32" />
+					<Add library="libjack" />
+					<Add library="libsamplerate-0" />
+					<Add directory="Debug\bin" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Profiling 32bits">
+				<Option output="Release\bin\jack_netsource" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release\" />
+				<Option type="1" />
+				<Option compiler="mingw_64" />
+				<Compiler>
+					<Add option="-O2" />
+					<Add option="-Wall" />
+					<Add option="-m32" />
+					<Add option="-DJACK_MONITOR" />
+					<Add directory="..\example-clients" />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+				</Compiler>
+				<Linker>
+					<Add option="-m32" />
+					<Add library="libjack" />
+					<Add library="libsamplerate-0" />
+					<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="ws2_32" />
+		</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>
+		<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>

windows/jack_portaudio.cbp

@@ -4,16 +4,102 @@
 	<Project>
 		<Option title="jack_portaudio" />
 		<Option pch_mode="2" />
-		<Option compiler="gcc" />
+		<Option compiler="mingw_64" />
 		<Build>
-			<Target title="Win32 Release">
+			<Target title="Win32 Release 64bits">
+				<Option output="Release64\bin\jack\jack_portaudio" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<Compiler>
+					<Add option="-O2" />
+					<Add option="-Wall" />
+					<Add option="-DWIN32" />
+					<Add option="-DNDEBUG" />
+					<Add option="-D_WINDOWS" />
+					<Add option="-D_MBCS" />
+					<Add option="-D_USRDLL" />
+					<Add option="-DJACK_PORTAUDIO_EXPORTS" />
+					<Add option="-DSERVER_SIDE" />
+					<Add directory="." />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+					<Add directory="portaudio" />
+				</Compiler>
+				<Linker>
+					<Add directory="..\windows" />
+					<Add directory="Release64\bin" />
+                    <Add library="libjackserver64" />
+                    <Add library="portaudio_x86_64" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Debug 64bits">
+				<Option output="Debug64\bin\jack\jack_portaudio" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Debug64" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<Compiler>
+					<Add option="-W" />
+					<Add option="-g" />
+					<Add option="-DWIN32" />
+					<Add option="-D_DEBUG" />
+					<Add option="-D_WINDOWS" />
+					<Add option="-D_MBCS" />
+					<Add option="-D_USRDLL" />
+					<Add option="-DJACK_PORTAUDIO_EXPORTS" />
+					<Add option="-DSERVER_SIDE" />
+					<Add directory="." />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+					<Add directory="portaudio" />
+				</Compiler>
+				<Linker>
+					<Add directory="Debug64\bin" />
+					<Add directory="..\windows" />
+                    <Add library="libjackserver64" />
+                    <Add library="portaudio_x86_64" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Profiling 64bits">
+				<Option output="Release64\bin\jack\jack_portaudio" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<Compiler>
+					<Add option="-O2" />
+					<Add option="-Wall" />
+					<Add option="-DWIN32" />
+					<Add option="-DNDEBUG" />
+					<Add option="-D_WINDOWS" />
+					<Add option="-D_MBCS" />
+					<Add option="-D_USRDLL" />
+					<Add option="-DJACK_PORTAUDIO_EXPORTS" />
+					<Add option="-DJACK_MONITOR" />
+					<Add option="-DSERVER_SIDE" />
+					<Add directory="." />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+					<Add directory="portaudio" />
+				</Compiler>
+				<Linker>
+					<Add directory="Release64\bin" />
+					<Add directory="..\windows" />
+                    <Add library="libjackserver64" />
+                    <Add library="portaudio_x86_64" />
+				</Linker>
+			</Target>
+            <Target title="Win32 Release 32bits">
 				<Option output="Release\bin\jack\jack_portaudio" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release" />
 				<Option type="3" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+                    <Add option="-m32" />
 					<Add option="-DWIN32" />
 					<Add option="-DNDEBUG" />
 					<Add option="-D_WINDOWS" />
@@ -30,16 +116,23 @@
 				<Linker>
 					<Add directory="..\windows" />
 					<Add directory="Release\bin" />
+                    <Add option="-m32" />
+                    <Add library="libjackserver" />
+                    <Add library="portaudio_x86" />
 				</Linker>
+                <ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Release/jackportaudio.res jackportaudio.rc" />
+				</ExtraCommands>
 			</Target>
-			<Target title="Win32 Debug">
+			<Target title="Win32 Debug 32bits">
 				<Option output="Debug\bin\jack\jack_portaudio" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug" />
 				<Option type="3" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-W" />
 					<Add option="-g" />
+                    <Add option="-m32" />
 					<Add option="-DWIN32" />
 					<Add option="-D_DEBUG" />
 					<Add option="-D_WINDOWS" />
@@ -56,16 +149,23 @@
 				<Linker>
 					<Add directory="Debug\bin" />
 					<Add directory="..\windows" />
+                    <Add option="-m32" />
+                    <Add library="libjackserver" />
+                    <Add library="portaudio_x86" />
 				</Linker>
+                <ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Debug/jackportaudio.res jackportaudio.rc" />
+				</ExtraCommands>
 			</Target>
-			<Target title="Win32 Profiling">
+			<Target title="Win32 Profiling 32bits">
 				<Option output="Release\bin\jack\jack_portaudio" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release" />
 				<Option type="3" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+                    <Add option="-m32" />
 					<Add option="-DWIN32" />
 					<Add option="-DNDEBUG" />
 					<Add option="-D_WINDOWS" />
@@ -83,9 +183,15 @@
 				<Linker>
 					<Add directory="Release\bin" />
 					<Add directory="..\windows" />
+                    <Add option="-m32" />
+                    <Add library="libjackserver" />
+                    <Add library="portaudio_x86" />
 				</Linker>
+                <ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Release/jackportaudio.res jackportaudio.rc" />
+				</ExtraCommands>
 			</Target>
-		</Build>
+        </Build>
 		<Compiler>
 			<Add option="-Wall" />
 		</Compiler>
@@ -102,8 +208,6 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjackserver" />
-			<Add library="portaudio_x86" />
 		</Linker>
 		<Unit filename="jackportaudio.rc">
 			<Option compilerVar="WINDRES" />

windows/jack_test.cbp

@@ -4,50 +4,112 @@
 	<Project>
 		<Option title="jack_test" />
 		<Option pch_mode="2" />
-		<Option compiler="gcc" />
+		<Option compiler="mingw_64" />
 		<Build>
-			<Target title="Win32 Release">
+			<Target title="Win32 Release 64bits">
+				<Option output="Release64\bin\jack_test" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64\" />
+				<Option type="1" />
+				<Option compiler="mingw_64" />
+				<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="Release64\bin" />
+                    <Add library="libjack64" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Debug 64bits">
+				<Option output="Debug64\bin\jack_test" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Debug64\" />
+				<Option type="1" />
+				<Option compiler="mingw_64" />
+				<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="Debug64\bin" />
+                    <Add library="libjack64" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Profiling 64bits">
+				<Option output="Release64\bin\jack_test" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64\" />
+				<Option type="1" />
+				<Option compiler="mingw_64" />
+				<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="Release64\bin" />
+                    <Add library="libjack64" />
+				</Linker>
+			</Target>
+            <Target title="Win32 Release 32bits">
 				<Option output="Release\bin\jack_test" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="1" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+                    <Add option="-m32" />
 					<Add directory="..\example-clients" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+                    <Add option="-m32" />
 					<Add directory="Release\bin" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
-			<Target title="Win32 Debug">
+			<Target title="Win32 Debug 32bits">
 				<Option output="Debug\bin\jack_test" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug\" />
 				<Option type="1" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-Wall" />
 					<Add option="-g" />
+                    <Add option="-m32" />
 					<Add directory="..\example-clients" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+                    <Add option="-m32" />
 					<Add directory="Debug\bin" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
-			<Target title="Win32 Profiling">
+			<Target title="Win32 Profiling 32bits">
 				<Option output="Release\bin\jack_test" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="1" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+                    <Add option="-m32" />
 					<Add option="-DJACK_MONITOR" />
 					<Add directory="..\example-clients" />
 					<Add directory="..\windows" />
@@ -55,7 +117,9 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+                    <Add option="-m32" />
 					<Add directory="Release\bin" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 		</Build>
@@ -75,7 +139,6 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjack" />
 		</Linker>
 		<Unit filename="..\tests\test.cpp">
 			<Option compilerVar="CC" />

windows/jack_unload.cbp

@@ -4,48 +4,107 @@
 	<Project>
 		<Option title="jack_unload" />
 		<Option pch_mode="2" />
-		<Option compiler="gcc" />
+		<Option compiler="mingw_64" />
 		<Build>
-			<Target title="Win32 Release">
+			<Target title="Win32 Release 64bits">
+				<Option output="Release64\bin\jack_unload" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64\" />
+				<Option type="1" />
+				<Option compiler="mingw_64" />
+				<Compiler>
+					<Add option="-O2" />
+					<Add option="-Wall" />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+				</Compiler>
+				<Linker>
+					<Add directory="Release64\bin" />
+                    <Add library="libjack64" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Debug 64bits">
+				<Option output="Debug64\bin\jack_unload" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Debug\64" />
+				<Option type="1" />
+				<Option compiler="mingw_64" />
+				<Compiler>
+					<Add option="-Wall" />
+					<Add option="-g" />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+				</Compiler>
+				<Linker>
+					<Add directory="Debug64\bin" />
+                    <Add library="libjack64" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Profiling 64bits">
+				<Option output="Release64\bin\jack_unload" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64\" />
+				<Option type="1" />
+				<Option compiler="mingw_64" />
+				<Compiler>
+					<Add option="-O2" />
+					<Add option="-Wall" />
+					<Add option="-DJACK_MONITOR" />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+				</Compiler>
+				<Linker>
+					<Add directory="Release64\bin" />
+                    <Add library="libjack64" />
+				</Linker>
+			</Target>
+            <Target title="Win32 Release 32bits">
 				<Option output="Release\bin\jack_unload" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="1" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+                    <Add option="-m32" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
+                    <Add option="-m32" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
-			<Target title="Win32 Debug">
+			<Target title="Win32 Debug 32bits">
 				<Option output="Debug\bin\jack_unload" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug\" />
 				<Option type="1" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-Wall" />
 					<Add option="-g" />
+                    <Add option="-m32" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin" />
+                    <Add option="-m32" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
-			<Target title="Win32 Profiling">
+			<Target title="Win32 Profiling 32bits">
 				<Option output="Release\bin\jack_unload" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="1" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+                    <Add option="-m32" />
 					<Add option="-DJACK_MONITOR" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
@@ -53,6 +112,8 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
+                    <Add option="-m32" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 		</Build>
@@ -72,7 +133,6 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjack" />
 		</Linker>
 		<Unit filename="..\example-clients\ipunload.c">
 			<Option compilerVar="CC" />

windows/jack_winmme.cbp

@@ -4,16 +4,96 @@
 	<Project>
 		<Option title="jack_winmme" />
 		<Option pch_mode="2" />
-		<Option compiler="gcc" />
+		<Option compiler="mingw_64" />
 		<Build>
-			<Target title="Win32 Release">
+			<Target title="Win32 Release 64bits">
+				<Option output="Release64\bin\jack\jack_winmme" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<Compiler>
+					<Add option="-O2" />
+					<Add option="-Wall" />
+					<Add option="-DWIN32" />
+					<Add option="-DNDEBUG" />
+					<Add option="-D_WINDOWS" />
+					<Add option="-D_MBCS" />
+					<Add option="-D_USRDLL" />
+					<Add option="-DSERVER_SIDE" />
+					<Add directory="." />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+					<Add directory="winmme" />
+				</Compiler>
+				<Linker>
+					<Add directory="..\windows" />
+					<Add directory="Release64\bin" />
+                    <Add library="libjackserver64" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Debug 64bits">
+				<Option output="Debug64\bin\jack\jack_winmme" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Debug64" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<Compiler>
+					<Add option="-W" />
+					<Add option="-g" />
+					<Add option="-DWIN32" />
+					<Add option="-D_DEBUG" />
+					<Add option="-D_WINDOWS" />
+					<Add option="-D_MBCS" />
+					<Add option="-D_USRDLL" />
+					<Add option="-DSERVER_SIDE" />
+					<Add directory="." />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+					<Add directory="winmme" />
+				</Compiler>
+				<Linker>
+					<Add directory="Debug64\bin" />
+					<Add directory="..\windows" />
+                    <Add library="libjackserver64" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Profiling 64bits">
+				<Option output="Release64\bin\jack\jack_winmme" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<Compiler>
+					<Add option="-O2" />
+					<Add option="-Wall" />
+					<Add option="-DWIN32" />
+					<Add option="-DNDEBUG" />
+					<Add option="-D_WINDOWS" />
+					<Add option="-D_MBCS" />
+					<Add option="-D_USRDLL" />
+					<Add option="-DJACK_MONITOR" />
+					<Add option="-DSERVER_SIDE" />
+					<Add directory="." />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+					<Add directory="winmme" />
+				</Compiler>
+				<Linker>
+					<Add directory="Release64\bin" />
+					<Add directory="..\windows" />
+                    <Add library="libjackserver64" />
+				</Linker>
+			</Target>
+            <Target title="Win32 Release 32bits">
 				<Option output="Release\bin\jack\jack_winmme" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release" />
 				<Option type="3" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+                     <Add option="-m32" />
 					<Add option="-DWIN32" />
 					<Add option="-DNDEBUG" />
 					<Add option="-D_WINDOWS" />
@@ -29,16 +109,22 @@
 				<Linker>
 					<Add directory="..\windows" />
 					<Add directory="Release\bin" />
+                    <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
+                <ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Release/jackwinmme.res jackwinmme.rc" />
+				</ExtraCommands>
 			</Target>
-			<Target title="Win32 Debug">
+			<Target title="Win32 Debug 32bits">
 				<Option output="Debug\bin\jack\jack_winmme" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug" />
 				<Option type="3" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-W" />
 					<Add option="-g" />
+                    <Add option="-m32" />
 					<Add option="-DWIN32" />
 					<Add option="-D_DEBUG" />
 					<Add option="-D_WINDOWS" />
@@ -54,16 +140,22 @@
 				<Linker>
 					<Add directory="Debug\bin" />
 					<Add directory="..\windows" />
+                    <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
+                <ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Debug/jackwinmme.res jackwinmme.rc" />
+				</ExtraCommands>
 			</Target>
-			<Target title="Win32 Profiling">
+			<Target title="Win32 Profiling 32bits">
 				<Option output="Release\bin\jack\jack_winmme" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release" />
 				<Option type="3" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+                    <Add option="-m32" />
 					<Add option="-DWIN32" />
 					<Add option="-DNDEBUG" />
 					<Add option="-D_WINDOWS" />
@@ -80,7 +172,12 @@
 				<Linker>
 					<Add directory="Release\bin" />
 					<Add directory="..\windows" />
+                    <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
+                <ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Debug/jackwinmme.res jackwinmme.rc" />
+				</ExtraCommands>
 			</Target>
 		</Build>
 		<Compiler>
@@ -99,7 +196,6 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjackserver" />
 			<Add library="winmm" />
 		</Linker>
 		<Unit filename="jackwinmme.rc">

windows/jackd.cbp

@@ -4,18 +4,91 @@
 	<Project>
 		<Option title="jackd" />
 		<Option pch_mode="2" />
-		<Option compiler="gcc" />
+		<Option compiler="mingw_64" />
 		<Build>
-			<Target title="Win32 Release">
+			<Target title="Win32 Release 64bits">
+				<Option output="Release64\bin\jackd" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64" />
+				<Option type="1" />
+				<Option compiler="mingw_64" />
+				<Option parameters="-R -S -d net" />
+				<Option host_application="jackdmp.exe" />
+				<Compiler>
+					<Add option="-O2" />
+					<Add option="-Wall" />
+					<Add option="-DWIN32" />
+					<Add option="-DNDEBUG" />
+					<Add option="-D_CONSOLE" />
+					<Add option="-D_MBCS" />
+					<Add directory="." />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+				</Compiler>
+				<Linker>
+					<Add directory="Release64\bin" />
+                    <Add library="libjackserver64" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Debug 64bits">
+				<Option output="Debug64\bin\jackd" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Debug64" />
+				<Option type="1" />
+				<Option compiler="mingw_64" />
+				<Option parameters="-R -S -d net" />
+				<Compiler>
+					<Add option="-Wall" />
+					<Add option="-g" />
+					<Add option="-DWIN32" />
+					<Add option="-D_DEBUG" />
+					<Add option="-D_CONSOLE" />
+					<Add option="-D_MBCS" />
+					<Add directory="." />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+				</Compiler>
+				<Linker>
+					<Add directory="Debug64\bin" />
+                    <Add library="libjackserver64" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Profiling 64bits">
+				<Option output="Release64\bin\jackd" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64" />
+				<Option type="1" />
+				<Option compiler="mingw_64" />
+				<Option parameters="-R -S -d net" />
+				<Option host_application="jackdmp.exe" />
+				<Compiler>
+					<Add option="-O2" />
+					<Add option="-Wall" />
+					<Add option="-DWIN32" />
+					<Add option="-DNDEBUG" />
+					<Add option="-D_CONSOLE" />
+					<Add option="-D_MBCS" />
+					<Add option="-DJACK_MONITOR" />
+					<Add directory="." />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+				</Compiler>
+				<Linker>
+					<Add directory="Release64\bin" />
+                    <Add library="libjackserver64" />
+				</Linker>
+			</Target>
+            <Target title="Win32 Release 32bits">
 				<Option output="Release\bin\jackd" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release" />
 				<Option type="1" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Option parameters="-R -S -d net" />
 				<Option host_application="jackdmp.exe" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+                    <Add option="-m32" />
 					<Add option="-DWIN32" />
 					<Add option="-DNDEBUG" />
 					<Add option="-D_CONSOLE" />
@@ -27,17 +100,23 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
+                    <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
+				<ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Release/jackd.res jackd.rc" />
+				</ExtraCommands>
 			</Target>
-			<Target title="Win32 Debug">
+			<Target title="Win32 Debug 32bits">
 				<Option output="Debug\bin\jackd" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug" />
 				<Option type="1" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Option parameters="-R -S -d net" />
 				<Compiler>
 					<Add option="-Wall" />
 					<Add option="-g" />
+                    <Add option="-m32" />
 					<Add option="-DWIN32" />
 					<Add option="-D_DEBUG" />
 					<Add option="-D_CONSOLE" />
@@ -49,18 +128,24 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin" />
+                    <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
+				<ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Debug/jackd.res jackd.rc" />
+				</ExtraCommands>
 			</Target>
-			<Target title="Win32 Profiling">
+			<Target title="Win32 Profiling 32bits">
 				<Option output="Release\bin\jackd" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release" />
 				<Option type="1" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Option parameters="-R -S -d net" />
 				<Option host_application="jackdmp.exe" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+                    <Add option="-m32" />
 					<Add option="-DWIN32" />
 					<Add option="-DNDEBUG" />
 					<Add option="-D_CONSOLE" />
@@ -73,7 +158,12 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
+                    <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
+				<ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Release/jackd.res jackd.rc" />
+				</ExtraCommands>
 			</Target>
 		</Build>
 		<Compiler>
@@ -92,7 +182,6 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjackserver" />
 		</Linker>
 		<Unit filename="..\common\Jackdmp.cpp" />
 		<Unit filename="getopt.c">

windows/jackd.workspace

@@ -1,62 +1,27 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_workspace_file>
 	<Workspace title="jack">
-		<Project filename="libjackserver.cbp" active="1" />
-		<Project filename="jackd.cbp">
-			<Depends filename="libjackserver.cbp" />
-		</Project>
-		<Project filename="jack_portaudio.cbp">
-			<Depends filename="libjackserver.cbp" />
-		</Project>
-		<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>
-		<Project filename="jack_netmanager.cbp">
-			<Depends filename="libjackserver.cbp" />
-		</Project>
-		<Project filename="jack_audioadapter.cbp">
-			<Depends filename="libjackserver.cbp" />
-		</Project>
-		<Project filename="jack_netadapter.cbp">
-			<Depends filename="libjackserver.cbp" />
-		</Project>
+		<Project filename="libjackserver.cbp" />
+		<Project filename="jack_portaudio.cbp" />
+		<Project filename="jack_netdriver.cbp" />
+		<Project filename="jack_netonedriver.cbp" />
+		<Project filename="jack_dummy.cbp" />
+		<Project filename="jack_netmanager.cbp" />
+		<Project filename="jack_audioadapter.cbp" />
+		<Project filename="jack_netadapter.cbp" />
 		<Project filename="libjack.cbp" />
-		<Project filename="jack_load.cbp">
-			<Depends filename="libjack.cbp" />
-		</Project>
-		<Project filename="jack_unload.cbp">
-			<Depends filename="libjack.cbp" />
-		</Project>
-		<Project filename="jack_lsp.cbp">
-			<Depends filename="libjack.cbp" />
-		</Project>
-		<Project filename="jack_latent_client.cbp">
-			<Depends filename="libjack.cbp" />
-		</Project>
-		<Project filename="jack_netsource.cbp">
-			<Depends filename="libjack.cbp" />
-			<Depends filename="jack_netonedriver.cbp" />
-		</Project>
-		<Project filename="jack_metro.cbp">
-			<Depends filename="libjack.cbp" />
-		</Project>
-		<Project filename="jack_connect.cbp">
-			<Depends filename="libjack.cbp" />
-		</Project>
-		<Project filename="jack_disconnect.cbp">
-			<Depends filename="libjack.cbp" />
-		</Project>
+		<Project filename="jack_load.cbp" />
+		<Project filename="jack_unload.cbp" />
+		<Project filename="jack_lsp.cbp" />
+		<Project filename="jack_latent_client.cbp" />
+		<Project filename="jack_netsource.cbp" active="1" />
+		<Project filename="jack_metro.cbp" />
+		<Project filename="jack_connect.cbp" />
+		<Project filename="jack_disconnect.cbp" />
 		<Project filename="jack_test.cbp" />
-		<Project filename="multiple_metro.cbp">
-			<Depends filename="libjack.cbp" />
-		</Project>
+		<Project filename="multiple_metro.cbp" />
 		<Project filename="jack_winmme.cbp" />
 		<Project filename="jack_loopback.cbp" />
+		<Project filename="jackd.cbp" />
 	</Workspace>
 </CodeBlocks_workspace_file>

windows/libjack.cbp

@@ -4,18 +4,146 @@
 	<Project>
 		<Option title="libjack" />
 		<Option pch_mode="2" />
-		<Option compiler="gcc" />
+		<Option compiler="mingw_64" />
 		<Build>
-			<Target title="Win32 Release">
+			<Target title="Win32 Release 64bits">
+				<Option output="Release64\bin\libjack64" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<Option createDefFile="1" />
+				<Option createStaticLib="1" />
+				<Compiler>
+					<Add option="-O2" />
+					<Add option="-Wall" />
+					<Add option="-DWIN32" />
+					<Add option="-DNDEBUG" />
+					<Add option="-D_WINDOWS" />
+					<Add option="-D_MBCS" />
+					<Add option="-D_USRDLL" />
+					<Add option="-DLIBJACKMP_EXPORTS" />
+					<Add option="-DREGEX_MALLOC" />
+					<Add option="-DSTDC_HEADERS" />
+					<Add option="-D__SMP__" />
+					<Add option="-DHAVE_CONFIG_H" />
+					<Add directory="." />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+					<Add directory="tre-0.8.0\win32" />
+					<Add directory="tre-0.8.0\lib" />
+				</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" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Debug 64bits">
+				<Option output="Debug64\bin\libjack64" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Debug64" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<Option createDefFile="1" />
+				<Option createStaticLib="1" />
+				<Compiler>
+					<Add option="-Wall" />
+					<Add option="-g" />
+					<Add option="-DWIN32" />
+					<Add option="-D_DEBUG" />
+					<Add option="-D_WINDOWS" />
+					<Add option="-D_MBCS" />
+					<Add option="-D_USRDLL" />
+					<Add option="-DLIBJACKMP_EXPORTS" />
+					<Add option="-DREGEX_MALLOC" />
+					<Add option="-DSTDC_HEADERS" />
+					<Add option="-D__SMP__" />
+					<Add option="-DHAVE_CONFIG_H" />
+					<Add directory="." />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+					<Add directory="tre-0.8.0\win32" />
+					<Add directory="tre-0.8.0\lib" />
+				</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" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Profiling 64bits">
+				<Option output="Release64\bin\libjack64" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<Option createDefFile="1" />
+				<Option createStaticLib="1" />
+				<Compiler>
+					<Add option="-O2" />
+					<Add option="-Wall" />
+					<Add option="-DWIN32" />
+					<Add option="-DNDEBUG" />
+					<Add option="-D_WINDOWS" />
+					<Add option="-D_MBCS" />
+					<Add option="-D_USRDLL" />
+					<Add option="-DLIBJACKMP_EXPORTS" />
+					<Add option="-DREGEX_MALLOC" />
+					<Add option="-DSTDC_HEADERS" />
+					<Add option="-D__SMP__" />
+					<Add option="-DJACK_MONITOR" />
+					<Add option="-DHAVE_CONFIG_H" />
+					<Add directory="." />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+					<Add directory="tre-0.8.0\win32" />
+					<Add directory="tre-0.8.0\lib" />
+				</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" />
+				</Linker>
+			</Target>
+            <Target title="Win32 Release 32bits">
 				<Option output="Release\bin\libjack" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release" />
 				<Option type="3" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Option createDefFile="1" />
 				<Option createStaticLib="1" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+                    <Add option="-m32" />
 					<Add option="-DWIN32" />
 					<Add option="-DNDEBUG" />
 					<Add option="-D_WINDOWS" />
@@ -34,6 +162,7 @@
 					<Add directory="tre-0.8.0\lib" />
 				</Compiler>
 				<Linker>
+                    <Add option="-m32" />
 					<Add library="kernel32" />
 					<Add library="user32" />
 					<Add library="gdi32" />
@@ -47,17 +176,21 @@
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
 				</Linker>
+                <ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Release/libjack.res libjack.rc" />
+				</ExtraCommands>
 			</Target>
-			<Target title="Win32 Debug">
+			<Target title="Win32 Debug 32bits">
 				<Option output="Debug\bin\libjack" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug" />
 				<Option type="3" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Option createDefFile="1" />
 				<Option createStaticLib="1" />
 				<Compiler>
 					<Add option="-Wall" />
 					<Add option="-g" />
+                    <Add option="-m32" />
 					<Add option="-DWIN32" />
 					<Add option="-D_DEBUG" />
 					<Add option="-D_WINDOWS" />
@@ -76,6 +209,7 @@
 					<Add directory="tre-0.8.0\lib" />
 				</Compiler>
 				<Linker>
+                    <Add option="-m32" />
 					<Add library="kernel32" />
 					<Add library="user32" />
 					<Add library="gdi32" />
@@ -89,17 +223,21 @@
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
 				</Linker>
+                <ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Debug/libjack.res libjack.rc" />
+				</ExtraCommands>
 			</Target>
-			<Target title="Win32 Profiling">
+			<Target title="Win32 Profiling 32bits">
 				<Option output="Release\bin\libjack" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release" />
 				<Option type="3" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Option createDefFile="1" />
 				<Option createStaticLib="1" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+                    <Add option="-m32" />
 					<Add option="-DWIN32" />
 					<Add option="-DNDEBUG" />
 					<Add option="-D_WINDOWS" />
@@ -119,6 +257,7 @@
 					<Add directory="tre-0.8.0\lib" />
 				</Compiler>
 				<Linker>
+                    <Add option="-m32" />
 					<Add library="kernel32" />
 					<Add library="user32" />
 					<Add library="gdi32" />
@@ -132,6 +271,9 @@
 					<Add library="odbc32" />
 					<Add library="odbccp32" />
 				</Linker>
+                <ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Release/libjack.res libjack.rc" />
+				</ExtraCommands>
 			</Target>
 		</Build>
 		<Compiler>

windows/libjackserver.cbp

@@ -7,8 +7,8 @@
 		<Option compiler="mingw_64" />
 		<Build>
 			<Target title="Win32 Release 64bits">
-				<Option output="Release\bin\libjackserver64" prefix_auto="1" extension_auto="1" />
-				<Option object_output="Release" />
+				<Option output="Release64\bin\libjackserver64" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64" />
 				<Option type="3" />
 				<Option compiler="mingw_64" />
 				<Option createDefFile="1" />
@@ -35,12 +35,12 @@
 					<Add directory="tre-0.8.0\lib" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin" />
+					<Add directory="Release\bin64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
-				<Option output="Debug\bin\libjackserver64" prefix_auto="1" extension_auto="1" />
-				<Option object_output="Debug" />
+				<Option output="Debug64\bin\libjackserver64" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Debug64" />
 				<Option type="3" />
 				<Option compiler="mingw_64" />
 				<Option createDefFile="1" />
@@ -67,7 +67,40 @@
 					<Add directory="tre-0.8.0\lib" />
 				</Compiler>
 				<Linker>
-					<Add directory="Debug\bin" />
+					<Add directory="Debug\bin64" />
+				</Linker>
+			</Target>
+            <Target title="Win32 Profiling 64bits">
+				<Option output="Release64\bin\libjackserver64" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<Option createDefFile="1" />
+				<Option createStaticLib="1" />
+				<Compiler>
+					<Add option="-O2" />
+					<Add option="-Wall" />
+					<Add option="-DWIN32" />
+					<Add option="-DNDEBUG" />
+					<Add option="-D_WINDOWS" />
+					<Add option="-D_MBCS" />
+					<Add option="-D_USRDLL" />
+					<Add option="-DLIBJACKDMP_EXPORTS" />
+					<Add option="-DREGEX_MALLOC" />
+					<Add option="-DSTDC_HEADERS" />
+					<Add option="-DSERVER_SIDE" />
+					<Add option="-D__SMP__" />
+					<Add option="-DJACK_MONITOR" />
+					<Add option="-DHAVE_CONFIG_H" />
+					<Add directory="." />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+					<Add directory="tre-0.8.0\win32" />
+					<Add directory="tre-0.8.0\lib" />
+				</Compiler>
+				<Linker>
+					<Add directory="Release\bin64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Release 32bits">
@@ -141,7 +174,7 @@
 					<Add directory="Debug\bin" />
 				</Linker>
 				<ExtraCommands>
-					<Add before="windres -F pe-i386 -O coff -o Release/libjackserver.res libjackserver.rc" />
+					<Add before="windres -F pe-i386 -O coff -o Debug/libjackserver.res libjackserver.rc" />
 				</ExtraCommands>
 			</Target>
 			<Target title="Win32 Profiling 32bits">

windows/multiple_metro.cbp

@@ -4,16 +4,71 @@
 	<Project>
 		<Option title="multiple_metro" />
 		<Option pch_mode="2" />
-		<Option compiler="gcc" />
+		<Option compiler="mingw_64" />
 		<Build>
-			<Target title="Win32 Release">
+			<Target title="Win32 Release 64bits">
+				<Option output="Release64\bin\multiple_metro" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64\" />
+				<Option type="1" />
+				<Option compiler="mingw_64" />
+				<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="Release64\bin" />
+                    <Add library="libjack64" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Debug 64bits">
+				<Option output="Debug64\bin\multiple_metro" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Debug64\" />
+				<Option type="1" />
+				<Option compiler="mingw_64" />
+				<Compiler>
+					<Add option="-g" />
+					<Add directory="..\tests" />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+				</Compiler>
+				<Linker>
+					<Add directory="Debug64\bin" />
+                    <Add library="libjack64" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Profiling 64bits">
+				<Option output="Release64\bin\multiple_metro" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64\" />
+				<Option type="1" />
+				<Option compiler="mingw_64" />
+				<Compiler>
+					<Add option="-O2" />
+					<Add option="-Wall" />
+					<Add option="-DJACK_MONITOR" />
+					<Add directory="..\tests" />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+				</Compiler>
+				<Linker>
+					<Add directory="Release64\bin" />
+                    <Add library="libjack64" />
+				</Linker>
+			</Target>
+            <Target title="Win32 Release 32bits">
 				<Option output="Release\bin\multiple_metro" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="1" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+                    <Add option="-m32" />
 					<Add directory="..\example-clients" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
@@ -21,15 +76,18 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
+                    <Add option="-m32" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
-			<Target title="Win32 Debug">
+			<Target title="Win32 Debug 32bits">
 				<Option output="Debug\bin\multiple_metro" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug\" />
 				<Option type="1" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-g" />
+                    <Add option="-m32" />
 					<Add directory="..\tests" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
@@ -37,16 +95,19 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin" />
+                    <Add option="-m32" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
-			<Target title="Win32 Profiling">
+			<Target title="Win32 Profiling 32bits">
 				<Option output="Release\bin\multiple_metro" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="1" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+                    <Add option="-m32" />
 					<Add option="-DJACK_MONITOR" />
 					<Add directory="..\tests" />
 					<Add directory="..\windows" />
@@ -55,6 +116,8 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
+                    <Add option="-m32" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 		</Build>
@@ -74,7 +137,6 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjack" />
 		</Linker>
 		<Unit filename="..\tests\external_metro.cpp">
 			<Option compilerVar="CC" />

windows/portaudio/JackPortAudioDevices.cpp

@@ -18,7 +18,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
 #include "JackPortAudioDevices.h"
-#include "JackError.h"
+#include "JackError.h"
+#include <stdlib.h>
 
 using namespace std;
 

windows/winmme/JackWinMMEInputPort.cpp

@@ -55,8 +55,8 @@ JackWinMMEInputPort::JackWinMMEInputPort(const char *alias_name,
     std::auto_ptr<JackMidiBufferWriteQueue> write_queue_ptr(write_queue);
     sysex_buffer = new jack_midi_data_t[max_bytes];
     char error_message[MAXERRORLENGTH];
-    MMRESULT result = midiInOpen(&handle, index, (DWORD)HandleMidiInputEvent,
-                                 (DWORD)this,
+    MMRESULT result = midiInOpen(&handle, index, (DWORD_PTR)HandleMidiInputEvent,
+                                 (DWORD_PTR)this,
                                  CALLBACK_FUNCTION | MIDI_IO_STATUS);
     if (result != MMSYSERR_NOERROR) {
         GetInErrorString(result, error_message);
@@ -181,7 +181,7 @@ void
 JackWinMMEInputPort::ProcessWinMME(UINT message, DWORD param1, DWORD param2)
 {
     set_threaded_log_function();
-    jack_nframes_t current_frame = GetCurrentFrame();
+    jack_nframes_t current_frame = GetCurrentFrame();
 
     switch (message) {
     case MIM_CLOSE:
@@ -192,7 +192,7 @@ JackWinMMEInputPort::ProcessWinMME(UINT message, DWORD param1, DWORD param2)
                   "driver thinks that JACK is not processing messages fast "
                   "enough.");
         // Fallthrough on purpose.
-    case MIM_DATA:
+    case MIM_DATA: {
         jack_midi_data_t message_buffer[3];
         jack_midi_data_t status = param1 & 0xff;
         int length = GetMessageLength(status);
@@ -219,14 +219,15 @@ JackWinMMEInputPort::ProcessWinMME(UINT message, DWORD param1, DWORD param2)
             return;
         }
         EnqueueMessage(current_frame, (size_t) length, message_buffer);
-        break;
-    case MIM_LONGDATA:
+        break;
+    }
+    case MIM_LONGDATA: {
         LPMIDIHDR header = (LPMIDIHDR) param1;
         jack_midi_data_t *data = (jack_midi_data_t *) header->lpData;
         size_t length1 = header->dwBytesRecorded;
         if ((data[0] != 0xf0) || (data[length1 - 1] != 0xf7)) {
             jack_error("JackWinMMEInputPort::ProcessWinMME - Discarding "
-                       "%d-byte sysex chunk.", length);
+                       "%d-byte sysex chunk.", length1);
         } else {
             EnqueueMessage(current_frame, length1, data);
         }
@@ -239,7 +240,8 @@ JackWinMMEInputPort::ProcessWinMME(UINT message, DWORD param1, DWORD param2)
             WriteInError("JackWinMMEInputPort::ProcessWinMME", "midiInAddBuffer",
                        result);
         }
-        break;
+        break;
+    }
     case MIM_LONGERROR:
         jack_error("JackWinMMEInputPort::ProcessWinMME - Invalid or "
                    "incomplete sysex message received.");

windows/winmme/JackWinMMEOutputPort.cpp

@@ -55,8 +55,8 @@ JackWinMMEOutputPort::JackWinMMEOutputPort(const char *alias_name,
     thread = new JackThread(this);
     std::auto_ptr<JackThread> thread_ptr(thread);
     char error_message[MAXERRORLENGTH];
-    MMRESULT result = midiOutOpen(&handle, index, (DWORD)HandleMessageEvent,
-                                  (DWORD)this, CALLBACK_FUNCTION);
+    MMRESULT result = midiOutOpen(&handle, index, (DWORD_PTR)HandleMessageEvent,
+                                  (DWORD_PTR)this, CALLBACK_FUNCTION);
     if (result != MMSYSERR_NOERROR) {
         GetOutErrorString(result, error_message);
         goto raise_exception;

windows/winmme/JackWinMMEPort.cpp

@@ -18,7 +18,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
 #include <memory>
-#include <stdexcept>
+#include <stdexcept>
+#include <stdio.h>
 
 #include "JackWinMMEPort.h"
 #include "JackError.h"