File 0002-Use-dll-names-corresponding-to-the-code-on... of Package mingw32-jack

Overview Repositories Revisions Requests Users Attributes Meta

File 0002-Use-dll-names-corresponding-to-the-code-on-Windows.patch of Package mingw32-jack (Revision 210ac2c86056fb42f2a01fc4d2cb32f3)

Currently displaying revision 210ac2c86056fb42f2a01fc4d2cb32f3 , Show latest

From 0fe0d5e7193dd78e5518beea11e528f20d6140e0 Mon Sep 17 00:00:00 2001
From: Martin Koegler <martin.koegler@chello.at>
Date: Thu, 25 Dec 2014 16:34:34 +0000
Subject: [PATCH 2/2] Use dll names corresponding to the code on Windows

---
 common/wscript | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/common/wscript b/common/wscript
index 97b4a2a..2b3d1ca 100644
--- a/common/wscript
+++ b/common/wscript
@@ -15,6 +15,8 @@ def configure(conf):
     conf.env['BUILD_ADAPTER'] = conf.is_defined('HAVE_SAMPLERATE')
 
     if conf.env['IS_WINDOWS']:
+        conf.check_cc(fragment='int main(){\n#ifndef _WIN64\nthis is a syntax error\n#endif\n}', define_name='BUILDING_FOR_WIN64', mandatory=False)
+        conf.env['IS_WIN64'] = conf.is_defined('BUILDING_FOR_WIN64')
         try:
             conf.check_cc(function_name='regcomp', header_name='regex.h', lib='regex', uselib_store="REGEX", define_name='HAVE_REGEX_H')
         except:
@@ -184,7 +186,10 @@ def build(bld):
             '../windows/JackMMCSS.cpp',
             ]
 
-    clientlib.vnum = bld.env['JACK_API_VERSION']
+    if bld.env['IS_WIN64']:
+        clientlib.env['cxxshlib_PATTERN'] = '%s64.dll'
+    if not bld.env['IS_WINDOWS']:
+        clientlib.vnum = bld.env['JACK_API_VERSION']
 
     if bld.env['IS_LINUX']:
         clientlib.env.append_value("CPPFLAGS", "-fvisibility=hidden")
@@ -283,7 +288,10 @@ def build(bld):
             '../windows/JackNetWinSocket.cpp',
             ]
 
-    serverlib.vnum = bld.env['JACK_API_VERSION']
+    if bld.env['IS_WIN64']:
+        serverlib.env['cxxshlib_PATTERN'] = '%s64.dll'
+    if not bld.env['IS_WINDOWS']:
+        serverlib.vnum = bld.env['JACK_API_VERSION']
 
     if bld.env['IS_LINUX']:
         serverlib.env.append_value("CPPFLAGS", "-fvisibility=hidden")
-- 
2.1.2

Places

File 0002-Use-dll-names-corresponding-to-the-code-on-Windows.patch of Package mingw32-jack (Revision 210ac2c86056fb42f2a01fc4d2cb32f3)

Places