Browse Source

Coorect Windows projects.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4585 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.9.8
sletz 13 years ago
parent
commit
d91cd42263
9 changed files with 106 additions and 106 deletions
  1. +23
    -23
      windows/jack_dummy.cbp
  2. +21
    -21
      windows/jack_netdriver.cbp
  3. +21
    -21
      windows/jack_netonedriver.cbp
  4. +29
    -29
      windows/jack_portaudio.cbp
  5. +2
    -2
      windows/jack_winmme.cbp
  6. +4
    -4
      windows/jackd.cbp
  7. +2
    -2
      windows/libjack.cbp
  8. +2
    -2
      windows/libjacknet.cbp
  9. +2
    -2
      windows/libjackserver.cbp

+ 23
- 23
windows/jack_dummy.cbp View File

@@ -13,18 +13,18 @@
<Option compiler="mingw_64" />
<Compiler>
<Add option="-O2" />
<Add option="-Wall" />
<Add option="-Wall" />
<Add option="-Wl,-subsystem,windows" />
<Add option="-DBUILD_DLL" />
<Add option="-DSERVER_SIDE" />
<Add option="-DJACK_32_64" />
<Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
</Compiler>
<Linker>
<Add directory="Release64\bin" />
<Add library="libjackserver64" />
<Add library="libjackserver64" />
</Linker>
</Target>
<Target title="Win32 Debug 64bits">
@@ -37,14 +37,14 @@
<Add option="-g" />
<Add option="-DBUILD_DLL" />
<Add option="-DSERVER_SIDE" />
<Add option="-DJACK_32_64" />
<Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
</Compiler>
<Linker>
<Add directory="Debug64\bin" />
<Add library="libjackserver64" />
<Add library="libjackserver64" />
</Linker>
</Target>
<Target title="Win32 Profiling 64bits">
@@ -54,19 +54,19 @@
<Option compiler="mingw_64" />
<Compiler>
<Add option="-O2" />
<Add option="-Wall" />
<Add option="-Wall" />
<Add option="-Wl,-subsystem,windows" />
<Add option="-DBUILD_DLL" />
<Add option="-DJACK_MONITOR" />
<Add option="-DSERVER_SIDE" />
<Add option="-DJACK_32_64" />
<Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
</Compiler>
<Linker>
<Add directory="Release64\bin" />
<Add library="libjackserver64" />
<Add library="libjackserver64" />
</Linker>
</Target>
<Target title="Win32 Release 32bits">
@@ -77,21 +77,21 @@
<Compiler>
<Add option="-O2" />
<Add option="-Wall" />
<Add option="-m32" />
<Add option="-m32" />
<Add option="-Wl,-subsystem,windows" />
<Add option="-DBUILD_DLL" />
<Add option="-DSERVER_SIDE" />
<Add option="-DJACK_32_64" />
<Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
</Compiler>
<Linker>
<Add option="-m32" />
<Add option="-m32" />
<Add directory="Release\bin" />
<Add library="libjackserver" />
<Add library="libjackserver" />
</Linker>
<ExtraCommands>
<ExtraCommands>
<Add before="windres -F pe-i386 -O coff -o Release/jackdummydriver.res jackdummydriver.rc" />
</ExtraCommands>
</Target>
@@ -103,20 +103,20 @@
<Compiler>
<Add option="-Wall" />
<Add option="-g" />
<Add option="-m32" />
<Add option="-m32" />
<Add option="-DBUILD_DLL" />
<Add option="-DSERVER_SIDE" />
<Add option="-DJACK_32_64" />
<Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
</Compiler>
<Linker>
<Add option="-m32" />
<Add option="-m32" />
<Add directory="Debug\bin" />
<Add library="libjackserver" />
<Add library="libjackserver" />
</Linker>
<ExtraCommands>
<ExtraCommands>
<Add before="windres -F pe-i386 -O coff -o Debug/jackdummydriver.res jackdummydriver.rc" />
</ExtraCommands>
</Target>
@@ -128,22 +128,22 @@
<Compiler>
<Add option="-O2" />
<Add option="-Wall" />
<Add option="-m32" />
<Add option="-m32" />
<Add option="-Wl,-subsystem,windows" />
<Add option="-DBUILD_DLL" />
<Add option="-DJACK_MONITOR" />
<Add option="-DSERVER_SIDE" />
<Add option="-DJACK_32_64" />
<Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
</Compiler>
<Linker>
<Add option="-m32" />
<Add option="-m32" />
<Add directory="Release\bin" />
<Add library="libjackserver" />
<Add library="libjackserver" />
</Linker>
<ExtraCommands>
<ExtraCommands>
<Add before="windres -F pe-i386 -O coff -o Release/jackdummydriver.res jackdummydriver.rc" />
</ExtraCommands>
</Target>


+ 21
- 21
windows/jack_netdriver.cbp View File

@@ -17,14 +17,14 @@
<Add option="-Wl,-subsystem,windows" />
<Add option="-DBUILD_DLL" />
<Add option="-DSERVER_SIDE" />
<Add option="-DJACK_32_64" />
<Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
</Compiler>
<Linker>
<Add directory="Release64\bin" />
<Add library="libjackserver64" />
<Add library="libjackserver64" />
</Linker>
</Target>
<Target title="Win32 Debug 64bits">
@@ -37,14 +37,14 @@
<Add option="-g" />
<Add option="-DBUILD_DLL" />
<Add option="-DSERVER_SIDE" />
<Add option="-DJACK_32_64" />
<Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
</Compiler>
<Linker>
<Add directory="Debug64\bin" />
<Add library="libjackserver64" />
<Add library="libjackserver64" />
</Linker>
</Target>
<Target title="Win32 Profiling 64bits">
@@ -59,14 +59,14 @@
<Add option="-DBUILD_DLL" />
<Add option="-DJACK_MONITOR" />
<Add option="-DSERVER_SIDE" />
<Add option="-DJACK_32_64" />
<Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
</Compiler>
<Linker>
<Add directory="Release64\bin" />
<Add library="libjackserver64" />
<Add library="libjackserver64" />
</Linker>
</Target>
<Target title="Win32 Release 32bits">
@@ -77,21 +77,21 @@
<Compiler>
<Add option="-O2" />
<Add option="-Wall" />
<Add option="-m32" />
<Add option="-m32" />
<Add option="-Wl,-subsystem,windows" />
<Add option="-DBUILD_DLL" />
<Add option="-DSERVER_SIDE" />
<Add option="-DJACK_32_64" />
<Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
</Compiler>
<Linker>
<Add directory="Release\bin" />
<Add option="-m32" />
<Add library="libjackserver" />
<Add option="-m32" />
<Add library="libjackserver" />
</Linker>
<ExtraCommands>
<ExtraCommands>
<Add before="windres -F pe-i386 -O coff -o Release/jacknetdriver.res jacknetdriver.rc" />
</ExtraCommands>
</Target>
@@ -103,20 +103,20 @@
<Compiler>
<Add option="-Wall" />
<Add option="-g" />
<Add option="-m32" />
<Add option="-m32" />
<Add option="-DBUILD_DLL" />
<Add option="-DSERVER_SIDE" />
<Add option="-DJACK_32_64" />
<Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
</Compiler>
<Linker>
<Add directory="Debug\bin" />
<Add option="-m32" />
<Add library="libjackserver" />
<Add option="-m32" />
<Add library="libjackserver" />
</Linker>
<ExtraCommands>
<ExtraCommands>
<Add before="windres -F pe-i386 -O coff -o Debug/jacknetdriver.res jacknetdriver.rc" />
</ExtraCommands>
</Target>
@@ -128,22 +128,22 @@
<Compiler>
<Add option="-O2" />
<Add option="-Wall" />
<Add option="-m32" />
<Add option="-m32" />
<Add option="-Wl,-subsystem,windows" />
<Add option="-DBUILD_DLL" />
<Add option="-DJACK_MONITOR" />
<Add option="-DSERVER_SIDE" />
<Add option="-DJACK_32_64" />
<Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
</Compiler>
<Linker>
<Add directory="Release\bin" />
<Add option="-m32" />
<Add library="libjackserver" />
<Add option="-m32" />
<Add library="libjackserver" />
</Linker>
<ExtraCommands>
<ExtraCommands>
<Add before="windres -F pe-i386 -O coff -o Release/jacknetdriver.res jacknetdriver.rc" />
</ExtraCommands>
</Target>


+ 21
- 21
windows/jack_netonedriver.cbp View File

@@ -17,14 +17,14 @@
<Add option="-Wl,-subsystem,windows" />
<Add option="-DBUILD_DLL" />
<Add option="-DSERVER_SIDE" />
<Add option="-DJACK_32_64" />
<Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
</Compiler>
<Linker>
<Add directory="Release64\bin" />
<Add library="libjackserver64" />
<Add library="libjackserver64" />
</Linker>
</Target>
<Target title="Win32 Debug 64bits">
@@ -37,14 +37,14 @@
<Add option="-g" />
<Add option="-DBUILD_DLL" />
<Add option="-DSERVER_SIDE" />
<Add option="-DJACK_32_64" />
<Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
</Compiler>
<Linker>
<Add directory="Debug64\bin" />
<Add library="libjackserver64" />
<Add library="libjackserver64" />
</Linker>
</Target>
<Target title="Win32 Profiling 64bits">
@@ -59,14 +59,14 @@
<Add option="-DBUILD_DLL" />
<Add option="-DJACK_MONITOR" />
<Add option="-DSERVER_SIDE" />
<Add option="-DJACK_32_64" />
<Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
</Compiler>
<Linker>
<Add directory="Release64\bin" />
<Add library="libjackserver64" />
<Add library="libjackserver64" />
</Linker>
</Target>
<Target title="Win32 Release 32bits">
@@ -77,21 +77,21 @@
<Compiler>
<Add option="-O2" />
<Add option="-Wall" />
<Add option="-m32" />
<Add option="-m32" />
<Add option="-Wl,-subsystem,windows" />
<Add option="-DBUILD_DLL" />
<Add option="-DSERVER_SIDE" />
<Add option="-DJACK_32_64" />
<Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
</Compiler>
<Linker>
<Add directory="Release\bin" />
<Add option="-m32" />
<Add library="libjackserver" />
<Add option="-m32" />
<Add library="libjackserver" />
</Linker>
<ExtraCommands>
<ExtraCommands>
<Add before="windres -F pe-i386 -O coff -o Release/jacknetonedriver.res jacknetonedriver.rc" />
</ExtraCommands>
</Target>
@@ -103,20 +103,20 @@
<Compiler>
<Add option="-Wall" />
<Add option="-g" />
<Add option="-m32" />
<Add option="-m32" />
<Add option="-DBUILD_DLL" />
<Add option="-DSERVER_SIDE" />
<Add option="-DJACK_32_64" />
<Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
</Compiler>
<Linker>
<Add directory="Debug\bin" />
<Add option="-m32" />
<Add library="libjackserver" />
<Add option="-m32" />
<Add library="libjackserver" />
</Linker>
<ExtraCommands>
<ExtraCommands>
<Add before="windres -F pe-i386 -O coff -o Debug/jacknetonedriver.res jacknetonedriver.rc" />
</ExtraCommands>
</Target>
@@ -128,22 +128,22 @@
<Compiler>
<Add option="-O2" />
<Add option="-Wall" />
<Add option="-m32" />
<Add option="-m32" />
<Add option="-Wl,-subsystem,windows" />
<Add option="-DBUILD_DLL" />
<Add option="-DJACK_MONITOR" />
<Add option="-DSERVER_SIDE" />
<Add option="-DJACK_32_64" />
<Add option="-DJACK_32_64" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
</Compiler>
<Linker>
<Add directory="Release\bin" />
<Add option="-m32" />
<Add library="libjackserver" />
<Add option="-m32" />
<Add library="libjackserver" />
</Linker>
<ExtraCommands>
<ExtraCommands>
<Add before="windres -F pe-i386 -O coff -o Debug/jacknetonedriver.res jacknetonedriver.rc" />
</ExtraCommands>
</Target>


+ 29
- 29
windows/jack_portaudio.cbp View File

@@ -22,7 +22,7 @@
<Add option="-D_USRDLL" />
<Add option="-DJACK_PORTAUDIO_EXPORTS" />
<Add option="-DSERVER_SIDE" />
<Add option="-DJACK_32_64" />
<Add option="-DJACK_32_64" />
<Add directory="." />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
@@ -32,8 +32,8 @@
<Linker>
<Add directory="..\windows" />
<Add directory="Release64\bin" />
<Add library="libjackserver64" />
<Add library="portaudio_x86_64" />
<Add library="libjackserver64" />
<Add library="portaudio_x86_64" />
</Linker>
</Target>
<Target title="Win32 Debug 64bits">
@@ -46,12 +46,12 @@
<Add option="-g" />
<Add option="-DWIN32" />
<Add option="-D_DEBUG" />
<Add option="-D_WINDOWS" />
<Add option="-D_CONSOLE" />
<Add option="-D_MBCS" />
<Add option="-D_USRDLL" />
<Add option="-DJACK_PORTAUDIO_EXPORTS" />
<Add option="-DSERVER_SIDE" />
<Add option="-DJACK_32_64" />
<Add option="-DJACK_32_64" />
<Add directory="." />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
@@ -61,8 +61,8 @@
<Linker>
<Add directory="Debug64\bin" />
<Add directory="..\windows" />
<Add library="libjackserver64" />
<Add library="portaudio_x86_64" />
<Add library="libjackserver64" />
<Add library="portaudio_x86_64" />
</Linker>
</Target>
<Target title="Win32 Profiling 64bits">
@@ -82,7 +82,7 @@
<Add option="-DJACK_PORTAUDIO_EXPORTS" />
<Add option="-DJACK_MONITOR" />
<Add option="-DSERVER_SIDE" />
<Add option="-DJACK_32_64" />
<Add option="-DJACK_32_64" />
<Add directory="." />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
@@ -92,8 +92,8 @@
<Linker>
<Add directory="Release64\bin" />
<Add directory="..\windows" />
<Add library="libjackserver64" />
<Add library="portaudio_x86_64" />
<Add library="libjackserver64" />
<Add library="portaudio_x86_64" />
</Linker>
</Target>
<Target title="Win32 Release 32bits">
@@ -104,7 +104,7 @@
<Compiler>
<Add option="-O2" />
<Add option="-Wall" />
<Add option="-m32" />
<Add option="-m32" />
<Add option="-Wl,-subsystem,windows" />
<Add option="-DWIN32" />
<Add option="-DNDEBUG" />
@@ -113,7 +113,7 @@
<Add option="-D_USRDLL" />
<Add option="-DJACK_PORTAUDIO_EXPORTS" />
<Add option="-DSERVER_SIDE" />
<Add option="-DJACK_32_64" />
<Add option="-DJACK_32_64" />
<Add directory="." />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
@@ -123,11 +123,11 @@
<Linker>
<Add directory="..\windows" />
<Add directory="Release\bin" />
<Add option="-m32" />
<Add library="libjackserver" />
<Add library="portaudio_x86" />
<Add option="-m32" />
<Add library="libjackserver" />
<Add library="portaudio_x86" />
</Linker>
<ExtraCommands>
<ExtraCommands>
<Add before="windres -F pe-i386 -O coff -o Release/jackportaudio.res jackportaudio.rc" />
</ExtraCommands>
</Target>
@@ -139,15 +139,15 @@
<Compiler>
<Add option="-W" />
<Add option="-g" />
<Add option="-m32" />
<Add option="-m32" />
<Add option="-DWIN32" />
<Add option="-D_DEBUG" />
<Add option="-D_WINDOWS" />
<Add option="-D_CONSOLE" />
<Add option="-D_MBCS" />
<Add option="-D_USRDLL" />
<Add option="-DJACK_PORTAUDIO_EXPORTS" />
<Add option="-DSERVER_SIDE" />
<Add option="-DJACK_32_64" />
<Add option="-DJACK_32_64" />
<Add directory="." />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
@@ -157,11 +157,11 @@
<Linker>
<Add directory="Debug\bin" />
<Add directory="..\windows" />
<Add option="-m32" />
<Add library="libjackserver" />
<Add library="portaudio_x86" />
<Add option="-m32" />
<Add library="libjackserver" />
<Add library="portaudio_x86" />
</Linker>
<ExtraCommands>
<ExtraCommands>
<Add before="windres -F pe-i386 -O coff -o Debug/jackportaudio.res jackportaudio.rc" />
</ExtraCommands>
</Target>
@@ -173,7 +173,7 @@
<Compiler>
<Add option="-O2" />
<Add option="-Wall" />
<Add option="-m32" />
<Add option="-m32" />
<Add option="-Wl,-subsystem,windows" />
<Add option="-DWIN32" />
<Add option="-DNDEBUG" />
@@ -183,7 +183,7 @@
<Add option="-DJACK_PORTAUDIO_EXPORTS" />
<Add option="-DJACK_MONITOR" />
<Add option="-DSERVER_SIDE" />
<Add option="-DJACK_32_64" />
<Add option="-DJACK_32_64" />
<Add directory="." />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
@@ -193,11 +193,11 @@
<Linker>
<Add directory="Release\bin" />
<Add directory="..\windows" />
<Add option="-m32" />
<Add library="libjackserver" />
<Add library="portaudio_x86" />
<Add option="-m32" />
<Add library="libjackserver" />
<Add library="portaudio_x86" />
</Linker>
<ExtraCommands>
<ExtraCommands>
<Add before="windres -F pe-i386 -O coff -o Release/jackportaudio.res jackportaudio.rc" />
</ExtraCommands>
</Target>


+ 2
- 2
windows/jack_winmme.cbp View File

@@ -43,7 +43,7 @@
<Add option="-g" />
<Add option="-DWIN32" />
<Add option="-D_DEBUG" />
<Add option="-D_WINDOWS" />
<Add option="-D_CONSOLE" />
<Add option="-D_MBCS" />
<Add option="-D_USRDLL" />
<Add option="-DSERVER_SIDE" />
@@ -131,7 +131,7 @@
<Add option="-m32" />
<Add option="-DWIN32" />
<Add option="-D_DEBUG" />
<Add option="-D_WINDOWS" />
<Add option="-D_CONSOLE" />
<Add option="-D_MBCS" />
<Add option="-D_USRDLL" />
<Add option="-DSERVER_SIDE" />


+ 4
- 4
windows/jackd.cbp View File

@@ -19,7 +19,7 @@
<Add option="-Wl,-subsystem,windows" />
<Add option="-DWIN32" />
<Add option="-DNDEBUG" />
<Add option="-D_CONSOLE" />
<Add option="-D_WINDOWS" />
<Add option="-D_MBCS" />
<Add directory="." />
<Add directory="..\windows" />
@@ -67,7 +67,7 @@
<Add option="-Wl,-subsystem,windows" />
<Add option="-DWIN32" />
<Add option="-DNDEBUG" />
<Add option="-D_CONSOLE" />
<Add option="-D_WINDOWS" />
<Add option="-D_MBCS" />
<Add option="-DJACK_MONITOR" />
<Add directory="." />
@@ -94,7 +94,7 @@
<Add option="-Wl,-subsystem,windows" />
<Add option="-DWIN32" />
<Add option="-DNDEBUG" />
<Add option="-D_CONSOLE" />
<Add option="-D_WINDOWS" />
<Add option="-D_MBCS" />
<Add directory="." />
<Add directory="..\windows" />
@@ -152,7 +152,7 @@
<Add option="-Wl,-subsystem,windows" />
<Add option="-DWIN32" />
<Add option="-DNDEBUG" />
<Add option="-D_CONSOLE" />
<Add option="-D_WINDOWS" />
<Add option="-D_MBCS" />
<Add option="-DJACK_MONITOR" />
<Add directory="." />


+ 2
- 2
windows/libjack.cbp View File

@@ -62,7 +62,7 @@
<Add option="-g" />
<Add option="-DWIN32" />
<Add option="-D_DEBUG" />
<Add option="-D_WINDOWS" />
<Add option="-D_CONSOLE" />
<Add option="-D_MBCS" />
<Add option="-D_USRDLL" />
<Add option="-DLIBJACKMP_EXPORTS" />
@@ -201,7 +201,7 @@
<Add option="-m32" />
<Add option="-DWIN32" />
<Add option="-D_DEBUG" />
<Add option="-D_WINDOWS" />
<Add option="-D_CONSOLE" />
<Add option="-D_MBCS" />
<Add option="-D_USRDLL" />
<Add option="-DLIBJACKMP_EXPORTS" />


+ 2
- 2
windows/libjacknet.cbp View File

@@ -49,7 +49,7 @@
<Add option="-g" />
<Add option="-DWIN32" />
<Add option="-D_DEBUG" />
<Add option="-D_WINDOWS" />
<Add option="-D_CONSOLE" />
<Add option="-D_MBCS" />
<Add option="-D_USRDLL" />
<Add option="-DLIBJACKDMP_EXPORTS" />
@@ -149,7 +149,7 @@
<Add option="-m32" />
<Add option="-DWIN32" />
<Add option="-D_DEBUG" />
<Add option="-D_WINDOWS" />
<Add option="-D_CONSOLE" />
<Add option="-D_MBCS" />
<Add option="-D_USRDLL" />
<Add option="-DLIBJACKDMP_EXPORTS" />


+ 2
- 2
windows/libjackserver.cbp View File

@@ -53,7 +53,7 @@
<Add option="-g" />
<Add option="-DWIN32" />
<Add option="-D_DEBUG" />
<Add option="-D_WINDOWS" />
<Add option="-D_CONSOLE" />
<Add option="-D_MBCS" />
<Add option="-D_USRDLL" />
<Add option="-DLIBJACKDMP_EXPORTS" />
@@ -164,7 +164,7 @@
<Add option="-m32" />
<Add option="-DWIN32" />
<Add option="-D_DEBUG" />
<Add option="-D_WINDOWS" />
<Add option="-D_CONSOLE" />
<Add option="-D_MBCS" />
<Add option="-D_USRDLL" />
<Add option="-DLIBJACKDMP_EXPORTS" />


Loading…
Cancel
Save