summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>2011-10-26 10:27:47 +0000
committersletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>2011-10-26 10:27:47 +0000
commit24b75dbc1e6e172883488cb5bfd41150689d5d09 (patch)
tree66ca051a1bf67e24b294d9f79a9d99b9a50cb80b
parentb344aed584cdea9fbd86fd0438aa275763718a0c (diff)
downloadjack2-24b75dbc1e6e172883488cb5bfd41150689d5d09.tar.gz
Activate JACK_32_64 on Windows (pure 32 bits and mixed 32/64 bits targets).
git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4552 0c269be4-1314-0410-8aa9-9f06e86f4224
Diffstat
-rw-r--r--windows/jack_audioadapter.cbp6
-rw-r--r--windows/jack_dummy.cbp6
-rw-r--r--windows/jack_loopback.cbp6
-rw-r--r--windows/jack_netadapter.cbp6
-rw-r--r--windows/jack_netdriver.cbp6
-rw-r--r--windows/jack_netmanager.cbp6
-rw-r--r--windows/jack_netonedriver.cbp6
-rw-r--r--windows/jack_portaudio.cbp6
-rw-r--r--windows/jack_winmme.cbp6
9 files changed, 54 insertions, 0 deletions
diff --git a/windows/jack_audioadapter.cbp b/windows/jack_audioadapter.cbp
index 6ad084a7..be22e0fd 100644
--- a/windows/jack_audioadapter.cbp
+++ b/windows/jack_audioadapter.cbp
@@ -17,6 +17,7 @@
<Add option="-DBUILD_DLL" />
<Add option="-D__SMP__" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
@@ -40,6 +41,7 @@
<Add option="-DBUILD_DLL" />
<Add option="-D__SMP__" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
@@ -64,6 +66,7 @@
<Add option="-D__SMP__" />
<Add option="-DJACK_MONITOR" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
@@ -88,6 +91,7 @@
<Add option="-DBUILD_DLL" />
<Add option="-D__SMP__" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
@@ -116,6 +120,7 @@
<Add option="-DBUILD_DLL" />
<Add option="-D__SMP__" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
@@ -145,6 +150,7 @@
<Add option="-D__SMP__" />
<Add option="-DJACK_MONITOR" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
diff --git a/windows/jack_dummy.cbp b/windows/jack_dummy.cbp
index 2347be2c..f964f5da 100644
--- a/windows/jack_dummy.cbp
+++ b/windows/jack_dummy.cbp
@@ -16,6 +16,7 @@
<Add option="-Wall" />
<Add option="-DBUILD_DLL" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
@@ -35,6 +36,7 @@
<Add option="-g" />
<Add option="-DBUILD_DLL" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
@@ -55,6 +57,7 @@
<Add option="-DBUILD_DLL" />
<Add option="-DJACK_MONITOR" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
@@ -75,6 +78,7 @@
<Add option="-m32" />
<Add option="-DBUILD_DLL" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
@@ -99,6 +103,7 @@
<Add option="-m32" />
<Add option="-DBUILD_DLL" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
@@ -124,6 +129,7 @@
<Add option="-DBUILD_DLL" />
<Add option="-DJACK_MONITOR" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
diff --git a/windows/jack_loopback.cbp b/windows/jack_loopback.cbp
index 3b7647af..a34089f9 100644
--- a/windows/jack_loopback.cbp
+++ b/windows/jack_loopback.cbp
@@ -16,6 +16,7 @@
<Add option="-Wall" />
<Add option="-DBUILD_DLL" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
@@ -35,6 +36,7 @@
<Add option="-g" />
<Add option="-DBUILD_DLL" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
@@ -55,6 +57,7 @@
<Add option="-DBUILD_DLL" />
<Add option="-DJACK_MONITOR" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
@@ -75,6 +78,7 @@
<Add option="-m32" />
<Add option="-DBUILD_DLL" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
@@ -99,6 +103,7 @@
<Add option="-m32" />
<Add option="-DBUILD_DLL" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
@@ -124,6 +129,7 @@
<Add option="-DBUILD_DLL" />
<Add option="-DJACK_MONITOR" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
diff --git a/windows/jack_netadapter.cbp b/windows/jack_netadapter.cbp
index 6424a96e..35558b61 100644
--- a/windows/jack_netadapter.cbp
+++ b/windows/jack_netadapter.cbp
@@ -16,6 +16,7 @@
<Add option="-Wall" />
<Add option="-DBUILD_DLL" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
@@ -36,6 +37,7 @@
<Add option="-g" />
<Add option="-DBUILD_DLL" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
@@ -57,6 +59,7 @@
<Add option="-DBUILD_DLL" />
<Add option="-DJACK_MONITOR" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
@@ -78,6 +81,7 @@
<Add option="-m32" />
<Add option="-DBUILD_DLL" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
@@ -103,6 +107,7 @@
<Add option="-m32" />
<Add option="-DBUILD_DLL" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
@@ -129,6 +134,7 @@
<Add option="-DBUILD_DLL" />
<Add option="-DJACK_MONITOR" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
diff --git a/windows/jack_netdriver.cbp b/windows/jack_netdriver.cbp
index b99f8201..9c0abdb2 100644
--- a/windows/jack_netdriver.cbp
+++ b/windows/jack_netdriver.cbp
@@ -16,6 +16,7 @@
<Add option="-Wall" />
<Add option="-DBUILD_DLL" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
@@ -35,6 +36,7 @@
<Add option="-g" />
<Add option="-DBUILD_DLL" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
@@ -55,6 +57,7 @@
<Add option="-DBUILD_DLL" />
<Add option="-DJACK_MONITOR" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
@@ -75,6 +78,7 @@
<Add option="-m32" />
<Add option="-DBUILD_DLL" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
@@ -99,6 +103,7 @@
<Add option="-m32" />
<Add option="-DBUILD_DLL" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
@@ -124,6 +129,7 @@
<Add option="-DBUILD_DLL" />
<Add option="-DJACK_MONITOR" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
diff --git a/windows/jack_netmanager.cbp b/windows/jack_netmanager.cbp
index 871682a0..12fc83e2 100644
--- a/windows/jack_netmanager.cbp
+++ b/windows/jack_netmanager.cbp
@@ -15,6 +15,7 @@
<Add option="-O2" />
<Add option="-Wall" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
@@ -33,6 +34,7 @@
<Add option="-Wall" />
<Add option="-g" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
@@ -52,6 +54,7 @@
<Add option="-Wall" />
<Add option="-DJACK_MONITOR" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
@@ -71,6 +74,7 @@
<Add option="-Wall" />
<Add option="-m32" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
@@ -94,6 +98,7 @@
<Add option="-g" />
<Add option="-m32" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
@@ -118,6 +123,7 @@
<Add option="-m32" />
<Add option="-DJACK_MONITOR" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
diff --git a/windows/jack_netonedriver.cbp b/windows/jack_netonedriver.cbp
index 7617d3da..808c6216 100644
--- a/windows/jack_netonedriver.cbp
+++ b/windows/jack_netonedriver.cbp
@@ -16,6 +16,7 @@
<Add option="-Wall" />
<Add option="-DBUILD_DLL" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
@@ -35,6 +36,7 @@
<Add option="-g" />
<Add option="-DBUILD_DLL" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
@@ -55,6 +57,7 @@
<Add option="-DBUILD_DLL" />
<Add option="-DJACK_MONITOR" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
@@ -75,6 +78,7 @@
<Add option="-m32" />
<Add option="-DBUILD_DLL" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
@@ -99,6 +103,7 @@
<Add option="-m32" />
<Add option="-DBUILD_DLL" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
@@ -124,6 +129,7 @@
<Add option="-DBUILD_DLL" />
<Add option="-DJACK_MONITOR" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
diff --git a/windows/jack_portaudio.cbp b/windows/jack_portaudio.cbp
index f9ec33d5..5cda5fac 100644
--- a/windows/jack_portaudio.cbp
+++ b/windows/jack_portaudio.cbp
@@ -21,6 +21,7 @@
<Add option="-D_USRDLL" />
<Add option="-DJACK_PORTAUDIO_EXPORTS" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="." />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
@@ -49,6 +50,7 @@
<Add option="-D_USRDLL" />
<Add option="-DJACK_PORTAUDIO_EXPORTS" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="." />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
@@ -78,6 +80,7 @@
<Add option="-DJACK_PORTAUDIO_EXPORTS" />
<Add option="-DJACK_MONITOR" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="." />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
@@ -107,6 +110,7 @@
<Add option="-D_USRDLL" />
<Add option="-DJACK_PORTAUDIO_EXPORTS" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="." />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
@@ -140,6 +144,7 @@
<Add option="-D_USRDLL" />
<Add option="-DJACK_PORTAUDIO_EXPORTS" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="." />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
@@ -174,6 +179,7 @@
<Add option="-DJACK_PORTAUDIO_EXPORTS" />
<Add option="-DJACK_MONITOR" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="." />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
diff --git a/windows/jack_winmme.cbp b/windows/jack_winmme.cbp
index bfabb287..1d46d508 100644
--- a/windows/jack_winmme.cbp
+++ b/windows/jack_winmme.cbp
@@ -20,6 +20,7 @@
<Add option="-D_MBCS" />
<Add option="-D_USRDLL" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="." />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
@@ -46,6 +47,7 @@
<Add option="-D_MBCS" />
<Add option="-D_USRDLL" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="." />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
@@ -73,6 +75,7 @@
<Add option="-D_USRDLL" />
<Add option="-DJACK_MONITOR" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="." />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
@@ -100,6 +103,7 @@
<Add option="-D_MBCS" />
<Add option="-D_USRDLL" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="." />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
@@ -131,6 +135,7 @@
<Add option="-D_MBCS" />
<Add option="-D_USRDLL" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="." />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
@@ -163,6 +168,7 @@
<Add option="-D_USRDLL" />
<Add option="-DJACK_MONITOR" />
<Add option="-DSERVER_SIDE" />
+ <Add option="-DJACK_32_64" />
<Add directory="." />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
View Lorry Controller Status