Skip to content

Commit

Permalink
macOS related fixes
Browse files Browse the repository at this point in the history
Signed-off-by: falkTX <[email protected]>
  • Loading branch information
falkTX committed Oct 7, 2023
1 parent e190976 commit f4147f7
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 4 deletions.
9 changes: 8 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@ TARGETS += build/libjack.0.dylib
TARGETS += build/libjackserver.0.dylib
TARGETS += build/jack/jack_coreaudio.so
TARGETS += build/jack/jack_coremidi.so
TARGETS += build/mod-app.app
else ifeq ($(WINDOWS),true)
TARGETS += build/libjack64.dll
TARGETS += build/libjackserver64.dll
TARGETS += build/libpython3.8.dll
TARGETS += build/jack/jack_portaudio.dll
TARGETS += build/jack/jack_winmme.dll
TARGETS += build/mod-app.exe
TARGETS += build/Qt5Core.dll
TARGETS += build/Qt5Gui.dll
TARGETS += build/Qt5Svg.dll
Expand Down Expand Up @@ -217,6 +217,9 @@ version:
macos:
$(MAKE) PAWPAW_TARGET=macos-universal-10.15

macos-app:
./utils/run.sh macos-universal-10.15 $(MAKE) -C systray

macos-plugins:
$(MAKE) PAWPAW_TARGET=macos-universal-10.15 plugins

Expand Down Expand Up @@ -301,6 +304,10 @@ build/mod-app$(APP_EXT): systray/mod-app$(APP_EXT)
@mkdir -p build
ln -sf $(abspath $<) $@

build/mod-app.app: systray/mod-app$(APP_EXT)
@mkdir -p build
ln -sf $(abspath $<) $@

build/default.pedalboard: mod-ui/default.pedalboard
@mkdir -p build
ln -sf $(abspath $<) $@
Expand Down
2 changes: 1 addition & 1 deletion PawPaw
2 changes: 1 addition & 1 deletion mod-ui
3 changes: 2 additions & 1 deletion systray/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
CC ?= gcc
CXX ?= g++

CXXFLAGS += -fPIC
CXXFLAGS += -fPIC -std=gnu++14

TARGET_MACHINE := $(shell $(CC) -dumpmachine)

Expand Down Expand Up @@ -77,6 +77,7 @@ clean:
rm -f $(TARGET) $(EXTRAS) qrc_mod-app.hpp ui_mod-app.hpp

$(TARGET): $(OBJS)
@$(shell mkdir -p $(@D))
$(CXX) $^ $(LDFLAGS) $(QT5_LIBS) -o $@

main.cpp.o: main.cpp mod-app.hpp qrc_mod-app.hpp ui_mod-app.hpp
Expand Down
5 changes: 5 additions & 0 deletions systray/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ static const WCHAR* user_files_dir = nullptr;
#include <dlfcn.h>
#endif

#ifdef __APPLE__
#include <sys/syslimits.h>
#define MAX_PATH PATH_MAX
#endif

QString getUserFilesDir()
{
#ifdef _WIN32
Expand Down

0 comments on commit f4147f7

Please sign in to comment.