Browse Source

Disable OpenMP on Mac

tags/v1.0.0
Andrew Belt 5 years ago
parent
commit
278c9dd387
3 changed files with 10 additions and 6 deletions
  1. +5
    -4
      Makefile
  2. +5
    -1
      dep.mk
  3. +0
    -1
      src/engine/Engine.cpp

+ 5
- 4
Makefile View File

@@ -4,8 +4,6 @@ VERSION = 1.dev
FLAGS += -DVERSION=$(VERSION) FLAGS += -DVERSION=$(VERSION)
FLAGS += -Iinclude FLAGS += -Iinclude
FLAGS += -Idep/include -Idep/lib/libzip/include FLAGS += -Idep/include -Idep/lib/libzip/include
FLAGS += -fopenmp
LDFLAGS += -fopenmp


include arch.mk include arch.mk


@@ -20,8 +18,7 @@ SOURCES += $(wildcard src/*.cpp src/*/*.cpp)


ifdef ARCH_MAC ifdef ARCH_MAC
SOURCES += dep/osdialog/osdialog_mac.m SOURCES += dep/osdialog/osdialog_mac.m
CXXFLAGS += -stdlib=libc++
LDFLAGS += -stdlib=libc++ -lpthread -ldl \
LDFLAGS += -lpthread -ldl \
-framework Cocoa -framework OpenGL -framework IOKit -framework CoreVideo -framework CoreAudio -framework CoreMIDI \ -framework Cocoa -framework OpenGL -framework IOKit -framework CoreVideo -framework CoreAudio -framework CoreMIDI \
-Ldep/lib dep/lib/libglfw3.a dep/lib/libGLEW.a dep/lib/libjansson.a dep/lib/libspeexdsp.a dep/lib/libzip.a dep/lib/libz.a dep/lib/librtaudio.a dep/lib/librtmidi.a dep/lib/libcrypto.a dep/lib/libssl.a dep/lib/libcurl.a -Ldep/lib dep/lib/libglfw3.a dep/lib/libGLEW.a dep/lib/libjansson.a dep/lib/libspeexdsp.a dep/lib/libzip.a dep/lib/libz.a dep/lib/librtaudio.a dep/lib/librtmidi.a dep/lib/libcrypto.a dep/lib/libssl.a dep/lib/libcurl.a
TARGET := Rack TARGET := Rack
@@ -29,6 +26,8 @@ ifdef ARCH_MAC
endif endif


ifdef ARCH_WIN ifdef ARCH_WIN
FLAGS += -fopenmp
LDFLAGS += -fopenmp
SOURCES += dep/osdialog/osdialog_win.c SOURCES += dep/osdialog/osdialog_win.c
LDFLAGS += -static \ LDFLAGS += -static \
-Wl,--export-all-symbols,--out-implib,libRack.a -mwindows \ -Wl,--export-all-symbols,--out-implib,libRack.a -mwindows \
@@ -39,6 +38,8 @@ ifdef ARCH_WIN
endif endif


ifdef ARCH_LIN ifdef ARCH_LIN
FLAGS += -fopenmp
LDFLAGS += -fopenmp
SOURCES += dep/osdialog/osdialog_gtk2.c SOURCES += dep/osdialog/osdialog_gtk2.c
CFLAGS += $(shell pkg-config --cflags gtk+-2.0) CFLAGS += $(shell pkg-config --cflags gtk+-2.0)
LDFLAGS += -rdynamic \ LDFLAGS += -rdynamic \


+ 5
- 1
dep.mk View File

@@ -28,7 +28,11 @@ endif
# Some platforms try to install to lib64 # Some platforms try to install to lib64
CMAKE += -DCMAKE_INSTALL_LIBDIR=lib CMAKE += -DCMAKE_INSTALL_LIBDIR=lib


SHA256 := sha256check() { echo "$$2" "$$1" | sha256sum -c; }; sha256check
ifdef ARCH_MAC
SHA256 := sha256check() { echo "$$2 $$1" | shasum -a 256 -c; }; sha256check
else
SHA256 := sha256check() { echo "$$2 $$1" | sha256sum -c; }; sha256check
endif


# Export environment for all dependency targets # Export environment for all dependency targets
$(DEPS): export CFLAGS = $(DEP_CFLAGS) $(DEPS): export CFLAGS = $(DEP_CFLAGS)


+ 0
- 1
src/engine/Engine.cpp View File

@@ -8,7 +8,6 @@
#include <thread> #include <thread>
#include <condition_variable> #include <condition_variable>
#include <mutex> #include <mutex>
#include <omp.h>
#include <xmmintrin.h> #include <xmmintrin.h>
#include <pmmintrin.h> #include <pmmintrin.h>




Loading…
Cancel
Save