Browse Source

Move some files

tags/1.9.4
falkTX 12 years ago
parent
commit
985dda61a3
5 changed files with 8 additions and 7 deletions
  1. +8
    -7
      source/Makefile.mk
  2. +0
    -0
      source/modules/CarlaNative.h
  3. +0
    -0
      source/modules/CarlaNative.hpp
  4. +0
    -0
      source/modules/ladspa_rdf.hpp
  5. +0
    -0
      source/modules/lv2_rdf.hpp

+ 8
- 7
source/Makefile.mk View File

@@ -10,6 +10,9 @@
# Support for LADSPA, DSSI, LV2 and VST plugins # Support for LADSPA, DSSI, LV2 and VST plugins
CARLA_PLUGIN_SUPPORT = true CARLA_PLUGIN_SUPPORT = true


# Support for csound files (version 6)
CARLA_CSOUND_SUPPORT = true

# Support for GIG, SF2 and SFZ sample banks (through fluidsynth and linuxsampler) # Support for GIG, SF2 and SFZ sample banks (through fluidsynth and linuxsampler)
CARLA_SAMPLERS_SUPPORT = true CARLA_SAMPLERS_SUPPORT = true


@@ -25,18 +28,17 @@ CARLA_VESTIGE_HEADER = true
AR ?= ar AR ?= ar
CC ?= gcc CC ?= gcc
CXX ?= g++ CXX ?= g++
STRIP ?= strip


# -------------------------------------------------------------- # --------------------------------------------------------------


BASE_FLAGS = -Wall -Wextra -fPIC -DPIC -pipe BASE_FLAGS = -Wall -Wextra -fPIC -DPIC -pipe
BASE_OPTS = -O2 -ffast-math -mtune=generic -msse -mfpmath=sse
BASE_OPTS = -O3 -ffast-math -mtune=generic -msse -mfpmath=sse
BASE_OPTS += -fdata-sections -ffunction-sections BASE_OPTS += -fdata-sections -ffunction-sections
LINK_OPTS = -Wl,--gc-sections LINK_OPTS = -Wl,--gc-sections


ifeq ($(RASPPI),true) ifeq ($(RASPPI),true)
# Raspberry-Pi optimization flags # Raspberry-Pi optimization flags
BASE_OPTS = -O2 -ffast-math -march=armv6 -mfpu=vfp -mfloat-abi=hard
BASE_OPTS = -O3 -ffast-math -march=armv6 -mfpu=vfp -mfloat-abi=hard
LINK_OPTS = LINK_OPTS =
endif endif


@@ -86,12 +88,11 @@ endif


# -------------------------------------------------------------- # --------------------------------------------------------------


# TODO - move this to theme
ifeq ($(HAVE_QT4),true) ifeq ($(HAVE_QT4),true)
MOC ?= $(shell pkg-config --variable=moc_location QtCore) MOC ?= $(shell pkg-config --variable=moc_location QtCore)
RCC ?= $(shell pkg-config --variable=rcc_location QtCore) RCC ?= $(shell pkg-config --variable=rcc_location QtCore)
UIC ?= $(shell pkg-config --variable=uic_location QtCore) UIC ?= $(shell pkg-config --variable=uic_location QtCore)
else
MOC ?= moc
RCC ?= rcc
UIC ?= uic
endif endif

# --------------------------------------------------------------

source/backend/CarlaNative.h → source/modules/CarlaNative.h View File


source/backend/CarlaNative.hpp → source/modules/CarlaNative.hpp View File


source/includes/ladspa_rdf.hpp → source/modules/ladspa_rdf.hpp View File


source/includes/lv2_rdf.hpp → source/modules/lv2_rdf.hpp View File


Loading…
Cancel
Save