From f127b74fe878625fdd9360df642cf2e66d5c4735 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Sat, 15 Sep 2012 18:35:55 +0100
Subject: [PATCH] small Makefile changes

---
 Makefile                     | 19 +++++++++++++------
 c++/carla-rtmempool/Makefile |  4 ++--
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index f388c57..a6829e2 100644
--- a/Makefile
+++ b/Makefile
@@ -162,7 +162,7 @@ src/resources_rc.py: resources/resources.qrc
 
 # ------------------------------------------------------------------------------------------------------------------------------------------------------
 
-CPP: carla-backend carla-bridge carla-discovery carla-lilv carla-rtmempool jackmeter xycontroller
+CPP: carla-backend carla-bridge carla-discovery jackmeter xycontroller
 
 carla-backend: carla-lilv carla-rtmempool
 	$(MAKE) -C c++/carla-backend
@@ -170,7 +170,7 @@ carla-backend: carla-lilv carla-rtmempool
 carla-bridge: carla-lilv carla-rtmempool
 	$(MAKE) -C c++/carla-bridge
 
-carla-discovery:
+carla-discovery: carla-lilv
 	$(MAKE) -C c++/carla-discovery NATIVE=1
 
 carla-lilv:
@@ -187,6 +187,17 @@ xycontroller:
 
 # ------------------------------------------------------------------------------------------------------------------------------------------------------
 
+CPP_debug:
+	$(MAKE) -f Makefile.dbg -C c++/carla-backend
+	$(MAKE) -f Makefile.dbg -C c++/carla-bridge
+	$(MAKE) -f Makefile.dbg -C c++/carla-discovery NATIVE=1
+
+doc:
+	$(MAKE) doc -C c++/carla-backend
+	$(MAKE) doc -C c++/carla-bridge
+
+# ------------------------------------------------------------------------------------------------------------------------------------------------------
+
 posix32:
 	$(MAKE) -C c++/carla-bridge posix32
 	$(MAKE) -C c++/carla-discovery posix32
@@ -224,10 +235,6 @@ clean:
 	$(MAKE) clean -C c++/xycontroller
 	rm -f *~ src/*~ src/*.pyc src/ui_*.py src/resources_rc.py
 
-doc:
-	$(MAKE) doc -C c++/carla-backend
-	$(MAKE) doc -C c++/carla-bridge
-
 install:
 	# Create directories
 	install -d $(DESTDIR)$(PREFIX)/bin/
diff --git a/c++/carla-rtmempool/Makefile b/c++/carla-rtmempool/Makefile
index 31c71ec..c5fbcc1 100644
--- a/c++/carla-rtmempool/Makefile
+++ b/c++/carla-rtmempool/Makefile
@@ -57,7 +57,7 @@ carla_rtmempool_win32.a: $(OBJS_win32)
 	$(AR) rs $@ $^
 
 rtmempool_win32.o: rtmempool.c
-	$(CC) $< $(BUILD_FLAGS) $(32BIT_FLAGS) -c -o $@
+	$(CC) $< $(BUILD_FLAGS) -DPTW32_STATIC_LIB $(32BIT_FLAGS) -c -o $@
 
 # --------------------------------------------------------------
 
@@ -67,7 +67,7 @@ carla_rtmempool_win64.a: $(OBJS_win64)
 	$(AR) rs $@ $^
 
 rtmempool_win64.o: rtmempool.c
-	$(CC) $< $(BUILD_FLAGS) $(64BIT_FLAGS) -c -o $@
+	$(CC) $< $(BUILD_FLAGS) -DPTW32_STATIC_LIB $(64BIT_FLAGS) -c -o $@
 
 # --------------------------------------------------------------