Browse Source

Fix custom win32 detection, fixes missing HAVE_ASIO macro

Signed-off-by: falkTX <falktx@falktx.com>
tags/v1.9.20
falkTX 3 years ago
parent
commit
fd562bdf13
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      wscript

+ 2
- 2
wscript View File

@@ -218,7 +218,7 @@ def configure(conf):
if conf.env['IS_WINDOWS']: if conf.env['IS_WINDOWS']:
conf.env.append_unique('CCDEFINES', '_POSIX') conf.env.append_unique('CCDEFINES', '_POSIX')
conf.env.append_unique('CXXDEFINES', '_POSIX') conf.env.append_unique('CXXDEFINES', '_POSIX')
if Options.options.platform == 'msys':
if Options.options.platform in ('msys', 'win32'):
conf.env.append_value('INCLUDES', ['/mingw64/include']) conf.env.append_value('INCLUDES', ['/mingw64/include'])
conf.check( conf.check(
header_name='asio.h', header_name='asio.h',
@@ -388,7 +388,7 @@ def configure(conf):
# existing install paths that use ADDON_DIR rather than have to # existing install paths that use ADDON_DIR rather than have to
# have special cases for windows each time. # have special cases for windows each time.
conf.env['ADDON_DIR'] = conf.env['LIBDIR'] + '/jack' conf.env['ADDON_DIR'] = conf.env['LIBDIR'] + '/jack'
if Options.options.platform == 'msys':
if Options.options.platform in ('msys', 'win32'):
conf.define('ADDON_DIR', 'jack') conf.define('ADDON_DIR', 'jack')
conf.define('__STDC_FORMAT_MACROS', 1) # for PRIu64 conf.define('__STDC_FORMAT_MACROS', 1) # for PRIu64
else: else:


Loading…
Cancel
Save