Browse Source

Misc build fixes

tags/v1.9.11
falkTX 6 years ago
parent
commit
9ce64dfba4
4 changed files with 10 additions and 3 deletions
  1. +6
    -1
      data/windows/build-win.sh
  2. +1
    -1
      data/windows/common.env
  3. +2
    -0
      source/modules/water/memory/Atomic.h
  4. +1
    -1
      source/utils/CarlaPipeUtils.hpp

+ 6
- 1
data/windows/build-win.sh View File

@@ -76,7 +76,12 @@ export PYRCC="wine C:\\\\Python34\\\\Lib\\\\site-packages\\\\PyQt5\\\\pyrcc5.exe
make ${MAKE_ARGS}

if [ x"${ARCH}" != x"32" ]; then
make ${MAKE_ARGS} HAVE_LIBLO=false LDFLAGS="-L${TARGETDIR}/carla-w32/lib -L/opt/mingw32/lib -L/opt/mingw32/i686-w64-mingw32/lib" win32
make ${MAKE_ARGS} \
AR="i686-w64-mingw32-ar" \
CC="i686-w64-mingw32-gcc" \
CXX="i686-w64-mingw32-g++" \
LDFLAGS="-L${TARGETDIR}/carla-w32/lib -L/opt/mingw32/lib -L/opt/mingw32/i686-w64-mingw32/lib" \
win32
fi

# Testing:


+ 1
- 1
data/windows/common.env View File

@@ -17,7 +17,7 @@ MXML_VERSION=2.11
FFTW3_VERSION=3.3.7
QT5_VERSION=5.5.1
QT5_MVERSION=5.5
PYTHON_VERSION=3.4.7
PYTHON_VERSION=3.4.4
SIP_VERSION=4.17
PYLIBLO_VERSION=0.9.2
PYQT5_VERSION=5.5.1


+ 2
- 0
source/modules/water/memory/Atomic.h View File

@@ -28,6 +28,8 @@
#include "../water.h"
#include <stdint.h>
namespace water {
//==============================================================================


+ 1
- 1
source/utils/CarlaPipeUtils.hpp View File

@@ -1,6 +1,6 @@
/*
* Carla Pipe utils
* Copyright (C) 2013-2014 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2013-2018 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as


Loading…
Cancel
Save