Browse Source

Minor makefile cleanup; Set version as 1.0.4

tags/1.9.4
falkTX 12 years ago
parent
commit
4f143a52de
5 changed files with 4 additions and 20 deletions
  1. +0
    -16
      Makefile
  2. +1
    -1
      source/backend/plugin/VstPlugin.cpp
  3. +1
    -1
      source/bridges/CarlaBridgeUI-VST.cpp
  4. +1
    -1
      source/carla_shared.py
  5. +1
    -1
      source/discovery/carla-discovery.cpp

+ 0
- 16
Makefile View File

@@ -38,9 +38,6 @@ discovery:
plugin:
$(MAKE) -C source/plugin

tests:
$(MAKE) -C source/tests

theme:
$(MAKE) -C source/theme

@@ -127,7 +124,6 @@ clean:
$(MAKE) clean -C source/discovery
$(MAKE) clean -C source/libs
$(MAKE) clean -C source/plugin
$(MAKE) clean -C source/tests
$(MAKE) clean -C source/theme
$(MAKE) clean -C source/widgets
rm -f $(RES)
@@ -149,11 +145,6 @@ install:
install -d $(DESTDIR)$(PREFIX)/lib/carla/resources/
install -d $(DESTDIR)$(PREFIX)/lib/carla/resources/nekofilter/
install -d $(DESTDIR)$(PREFIX)/lib/carla/resources/zynaddsubfx/
# ifeq ($(CARLA_PLUGIN_SUPPORT),true)
# install -d $(DESTDIR)$(PREFIX)/lib/dssi/
# install -d $(DESTDIR)$(PREFIX)/lib/lv2/carla.lv2/
# install -d $(DESTDIR)$(PREFIX)/lib/vst/
# endif
install -d $(DESTDIR)$(PREFIX)/share/applications/
install -d $(DESTDIR)$(PREFIX)/share/carla/
install -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/
@@ -211,13 +202,6 @@ install:
install -m 644 source/backend/resources/nekofilter/*.png $(DESTDIR)$(PREFIX)/lib/carla/resources/nekofilter/
install -m 644 source/backend/resources/zynaddsubfx/*.png $(DESTDIR)$(PREFIX)/lib/carla/resources/zynaddsubfx/

# ifeq ($(CARLA_PLUGIN_SUPPORT),true)
# # Install plugin
# install -m 644 source/plugin/carla-dssi.so $(DESTDIR)$(PREFIX)/lib/dssi/
# install -m 644 source/plugin/carla-vst.so $(DESTDIR)$(PREFIX)/lib/vst/
# install -m 644 source/plugin/carla.lv2/* $(DESTDIR)$(PREFIX)/lib/lv2/carla.lv2/
# endif

# Adjust PREFIX value in script files
sed -i "s/X-PREFIX-X/$(SED_PREFIX)/" \
$(DESTDIR)$(PREFIX)/bin/carla \


+ 1
- 1
source/backend/plugin/VstPlugin.cpp View File

@@ -2465,7 +2465,7 @@ private:
}

case audioMasterGetVendorVersion:
return 0x103; // 1.0.3
return 0x104; // 1.0.4

case audioMasterCanDo:
CARLA_ASSERT(ptr != nullptr);


+ 1
- 1
source/bridges/CarlaBridgeUI-VST.cpp View File

@@ -480,7 +480,7 @@ public:
break;

case audioMasterGetVendorVersion:
ret = 0x103; // 1.0.3
ret = 0x104; // 1.0.4
break;

case audioMasterCanDo:


+ 1
- 1
source/carla_shared.py View File

@@ -70,7 +70,7 @@ elif WINDOWS:
# ------------------------------------------------------------------------------------------------------------
# Set Version

VERSION = "1.0.3"
VERSION = "1.0.4"

# ------------------------------------------------------------------------------------------------------------
# Set TMP


+ 1
- 1
source/discovery/carla-discovery.cpp View File

@@ -238,7 +238,7 @@ intptr_t VSTCALLBACK vstHostCallback(AEffect* const effect, const int32_t opcode
break;

case audioMasterGetVendorVersion:
ret = 0x103; // 1.0.3
ret = 0x104; // 1.0.4
break;

case audioMasterCanDo:


Loading…
Cancel
Save