From f760c5c1397f0b4f8ece0ad2be9bb92c96bc1831 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 8 Sep 2012 08:48:10 +0100 Subject: [PATCH] Update makefiles, fixes build on Arch --- Makefile | 10 +++++----- c++/carla-discovery/Makefile | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 1d722f6..4f413b5 100644 --- a/Makefile +++ b/Makefile @@ -149,18 +149,18 @@ src/resources_rc.py: resources/resources.qrc # ------------------------------------------------------------------------------------------------------------------------------------------------------ -CPP: carla_backend carla_bridge carla_discovery carla_lilv jackmeter xycontroller +CPP: carla-backend carla-bridge carla-discovery carla-lilv jackmeter xycontroller -carla_backend: carla_lilv +carla-backend: carla-lilv $(MAKE) -C c++/carla-backend -carla_bridge: carla_lilv +carla-bridge: carla-lilv $(MAKE) -C c++/carla-bridge -carla_discovery: +carla-discovery: $(MAKE) -C c++/carla-discovery NATIVE=1 -carla_lilv: +carla-lilv: $(MAKE) -C c++/carla-lilv jackmeter: diff --git a/c++/carla-discovery/Makefile b/c++/carla-discovery/Makefile index 5a7a4e9..390f5d5 100644 --- a/c++/carla-discovery/Makefile +++ b/c++/carla-discovery/Makefile @@ -57,7 +57,7 @@ win64: carla-discovery-win64.exe OBJS = carla-discovery.cpp carla-discovery-native: carla-discovery.cpp ../carla-lilv/carla_lilv.a - $(CXX) $^ $(BUILD_FLAGS) $(LINK_FLAGS) -o $@ && $(STRIP) $@ + $(CXX) $^ $(POSIX_BUILD_FLAGS) $(POSIX_LINK_FLAGS) -o $@ && $(STRIP) $@ carla-discovery-posix32: $(OBJS) ../carla-lilv/carla_lilv_posix32.a $(CXX) $^ $(POSIX_BUILD_FLAGS) $(POSIX_32BIT_FLAGS) $(POSIX_LINK_FLAGS) -o $@ && $(STRIP) $@