2 changed files with 15 additions and 8 deletions
Unified View
Diff Options
-
+13 -6Makefile
-
+2 -2c++/carla-rtmempool/Makefile
+ 13
- 6
Makefile
View File
| @@ -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 | carla-backend: carla-lilv carla-rtmempool | ||||
| $(MAKE) -C c++/carla-backend | $(MAKE) -C c++/carla-backend | ||||
| @@ -170,7 +170,7 @@ carla-backend: carla-lilv carla-rtmempool | |||||
| carla-bridge: carla-lilv carla-rtmempool | carla-bridge: carla-lilv carla-rtmempool | ||||
| $(MAKE) -C c++/carla-bridge | $(MAKE) -C c++/carla-bridge | ||||
| carla-discovery: | |||||
| carla-discovery: carla-lilv | |||||
| $(MAKE) -C c++/carla-discovery NATIVE=1 | $(MAKE) -C c++/carla-discovery NATIVE=1 | ||||
| carla-lilv: | 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: | posix32: | ||||
| $(MAKE) -C c++/carla-bridge posix32 | $(MAKE) -C c++/carla-bridge posix32 | ||||
| $(MAKE) -C c++/carla-discovery posix32 | $(MAKE) -C c++/carla-discovery posix32 | ||||
| @@ -224,10 +235,6 @@ clean: | |||||
| $(MAKE) clean -C c++/xycontroller | $(MAKE) clean -C c++/xycontroller | ||||
| rm -f *~ src/*~ src/*.pyc src/ui_*.py src/resources_rc.py | 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: | install: | ||||
| # Create directories | # Create directories | ||||
| install -d $(DESTDIR)$(PREFIX)/bin/ | install -d $(DESTDIR)$(PREFIX)/bin/ | ||||
+ 2
- 2
c++/carla-rtmempool/Makefile
View File
| @@ -57,7 +57,7 @@ carla_rtmempool_win32.a: $(OBJS_win32) | |||||
| $(AR) rs $@ $^ | $(AR) rs $@ $^ | ||||
| rtmempool_win32.o: rtmempool.c | 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 $@ $^ | $(AR) rs $@ $^ | ||||
| rtmempool_win64.o: rtmempool.c | rtmempool_win64.o: rtmempool.c | ||||
| $(CC) $< $(BUILD_FLAGS) $(64BIT_FLAGS) -c -o $@ | |||||
| $(CC) $< $(BUILD_FLAGS) -DPTW32_STATIC_LIB $(64BIT_FLAGS) -c -o $@ | |||||
| # -------------------------------------------------------------- | # -------------------------------------------------------------- | ||||