Browse Source

Experiment with some new build+link flags

tags/1.9.4
falkTX 11 years ago
parent
commit
ebf0fb78e4
10 changed files with 48 additions and 54 deletions
  1. +5
    -3
      source/Makefile.mk
  2. +3
    -3
      source/backend/standalone/Makefile
  3. +15
    -15
      source/bridges/Makefile
  4. +6
    -14
      source/discovery/Makefile
  5. +3
    -3
      source/modules/distrho/dgl/Makefile
  6. +4
    -4
      source/modules/jackbridge/Makefile
  7. +3
    -3
      source/modules/juce_core/Makefile
  8. +3
    -3
      source/modules/lilv/Makefile
  9. +3
    -3
      source/modules/rtmempool/Makefile
  10. +3
    -3
      source/modules/theme/Makefile

+ 5
- 3
source/Makefile.mk View File

@@ -31,18 +31,20 @@ STRIP ?= strip

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

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

ifeq ($(DEBUG),true)
BASE_FLAGS += -DDEBUG -O0 -g
CMD_STRIP = \# no-strip
else
BASE_FLAGS += -DNDEBUG $(BASE_OPTS) -fvisibility=hidden
CMD_STRIP = && $(STRIP)
LINK_OPTS += -Wl,--strip-all
endif

32BIT_FLAGS = -m32
@@ -50,7 +52,7 @@ endif

BUILD_C_FLAGS = $(BASE_FLAGS) -std=gnu99 $(CFLAGS)
BUILD_CXX_FLAGS = $(BASE_FLAGS) -std=gnu++0x $(CXXFLAGS)
LINK_FLAGS = $(LDFLAGS)
LINK_FLAGS = $(LINK_OPTS) $(LDFLAGS)

ifeq ($(MACOS),true)
# No C++11 support; force 32bit per default


+ 3
- 3
source/backend/standalone/Makefile View File

@@ -142,13 +142,13 @@ debug:
$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@

../libcarla_standalone.dll: $(OBJS) $(LIBS)
$(CXX) $^ -shared $(LINK_FLAGS) $(W32_LIBS) -Wl,--output-def,$@.def -o $@ $(CMD_STRIP) $@
$(CXX) $^ -shared $(LINK_FLAGS) $(W32_LIBS) -Wl,--output-def,$@.def -o $@

../libcarla_standalone.dylib: $(OBJS) $(LIBS)
$(CXX) $^ -dynamiclib $(LINK_FLAGS) -framework CoreAudio -framework CoreMIDI -framework CoreFoundation -o $@ $(CMD_STRIP) $@
$(CXX) $^ -dynamiclib $(LINK_FLAGS) -framework CoreAudio -framework CoreMIDI -framework CoreFoundation -o $@

../libcarla_standalone.so: $(OBJS) $(LIBS)
$(CXX) $^ -shared $(LINK_FLAGS) -o $@ $(CMD_STRIP) $@
$(CXX) $^ -shared $(LINK_FLAGS) -o $@

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



+ 15
- 15
source/bridges/Makefile View File

@@ -245,7 +245,7 @@ OBJS_UI_LV2_GTK2 = CarlaBridgeUI-LV2__lv2-gtk2.o \
CarlaBridgeToolkit__lv2.o CarlaBridgeToolkitGtk__lv2-gtk2.o

carla-bridge-lv2-gtk2: $(OBJS_UI_LV2_GTK2) $(OBJS_UI_LV2_LIBS)
$(CXX) $^ $(LINK_UI_LV2_GTK2_FLAGS) -o $@ $(CMD_STRIP) $@
$(CXX) $^ $(LINK_UI_LV2_GTK2_FLAGS) -o $@

%__lv2-gtk2.o: %.cpp
$(CXX) $< $(BUILD_UI_LV2_GTK2_FLAGS) -c -o $@
@@ -258,7 +258,7 @@ OBJS_UI_LV2_GTK3 = CarlaBridgeUI-LV2__lv2-gtk3.o \
CarlaBridgeToolkit__lv2.o CarlaBridgeToolkitGtk__lv2-gtk3.o

carla-bridge-lv2-gtk3: $(OBJS_UI_LV2_GTK3) $(OBJS_UI_LV2_LIBS)
$(CXX) $^ $(LINK_UI_LV2_GTK3_FLAGS) -o $@ $(CMD_STRIP) $@
$(CXX) $^ $(LINK_UI_LV2_GTK3_FLAGS) -o $@

%__lv2-gtk3.o: %.cpp
$(CXX) $< $(BUILD_UI_LV2_GTK3_FLAGS) -c -o $@
@@ -271,7 +271,7 @@ OBJS_UI_LV2_QT4 = CarlaBridgeUI-LV2__lv2-qt4.o \
CarlaBridgeToolkit__lv2.o CarlaBridgeToolkitQt__lv2-qt4.o

carla-bridge-lv2-qt4: $(OBJS_UI_LV2_QT4) $(OBJS_UI_LV2_LIBS) ../libs/theme.a
$(CXX) $^ $(LINK_UI_LV2_QT4_FLAGS) -o $@ $(CMD_STRIP) $@
$(CXX) $^ $(LINK_UI_LV2_QT4_FLAGS) -o $@

%__lv2-qt4.o: %.cpp CarlaBridgeToolkitQt.moc
$(CXX) $< $(BUILD_UI_LV2_QT4_FLAGS) -c -o $@
@@ -284,7 +284,7 @@ OBJS_UI_LV2_QT5 = CarlaBridgeUI-LV2__lv2-qt5.o \
CarlaBridgeToolkit__lv2.o CarlaBridgeToolkitQt__lv2-qt5.o

carla-bridge-lv2-qt5: $(OBJS_UI_LV2_QT5) $(OBJS_UI_LV2_LIBS) ../libs/theme.a
$(CXX) $^ $(LINK_UI_LV2_QT5_FLAGS) -o $@ $(CMD_STRIP) $@
$(CXX) $^ $(LINK_UI_LV2_QT5_FLAGS) -o $@

%__lv2-qt5.o: %.cpp CarlaBridgeToolkitQt.moc
$(CXX) $< $(BUILD_UI_LV2_QT5_FLAGS) -c -o $@
@@ -297,7 +297,7 @@ OBJS_UI_LV2_COCOA = CarlaBridgeUI-LV2__lv2-cocoa.o \
CarlaBridgeToolkit__lv2.o CarlaBridgeToolkitQt__lv2-cocoa.o

carla-bridge-lv2-cocoa: $(OBJS_UI_LV2_COCOA) $(OBJS_UI_LV2_LIBS) ../libs/theme.a
$(CXX) $^ $(LINK_UI_LV2_COCOA_FLAGS) -o $@ $(CMD_STRIP) $@
$(CXX) $^ $(LINK_UI_LV2_COCOA_FLAGS) -o $@

%__lv2-cocoa.o: %.cpp CarlaBridgeToolkitQt.moc
$(CXX) $< $(BUILD_UI_LV2_COCOA_FLAGS) -c -o $@
@@ -310,7 +310,7 @@ OBJS_UI_LV2_WIN32 = CarlaBridgeUI-LV2__lv2-windows.o \
CarlaBridgeToolkit__lv2.o CarlaBridgeToolkitQt__lv2-windows.o

carla-bridge-lv2-windows.exe: $(OBJS_UI_LV2_WIN32) $(OBJS_UI_LV2_LIBS) ../libs/theme.a
$(CXX) $^ $(LINK_UI_LV2_WIN32_FLAGS) -o $@ $(CMD_STRIP) $@
$(CXX) $^ $(LINK_UI_LV2_WIN32_FLAGS) -o $@

%__lv2-windows.o: %.cpp CarlaBridgeToolkitQt.moc
$(CXX) $< $(BUILD_UI_LV2_WIN32_FLAGS) -c -o $@
@@ -323,7 +323,7 @@ OBJS_UI_LV2_X11 = CarlaBridgeUI-LV2__lv2-x11.o \
CarlaBridgeToolkit__lv2.o CarlaBridgeToolkitQt__lv2-x11.o

carla-bridge-lv2-x11: $(OBJS_UI_LV2_X11) $(OBJS_UI_LV2_LIBS) ../libs/theme.a
$(CXX) $^ $(LINK_UI_LV2_X11_FLAGS) -o $@ $(CMD_STRIP) $@
$(CXX) $^ $(LINK_UI_LV2_X11_FLAGS) -o $@

%__lv2-x11.o: %.cpp CarlaBridgeToolkitQt.moc
$(CXX) $< $(BUILD_UI_LV2_X11_FLAGS) -c -o $@
@@ -336,7 +336,7 @@ OBJS_UI_VST_COCOA = CarlaBridgeUI-VST__vst-cocoa.o \
CarlaBridgeToolkit__vst.o CarlaBridgeToolkitQt__vst-cocoa.o

carla-bridge-vst-cocoa: $(OBJS_UI_VST_COCOA) ../libs/theme.a
$(CXX) $^ $(LINK_UI_VST_COCOA_FLAGS) -o $@ $(CMD_STRIP) $@
$(CXX) $^ $(LINK_UI_VST_COCOA_FLAGS) -o $@

%__vst-cocoa.o: %.cpp CarlaBridgeToolkitQt.moc
$(CXX) $< $(BUILD_UI_VST_COCOA_FLAGS) -c -o $@
@@ -349,7 +349,7 @@ OBJS_UI_VST_HWND = CarlaBridgeUI-VST__vst-hwnd.o \
CarlaBridgeToolkit__vst.o CarlaBridgeToolkitQt__vst-hwnd.o

carla-bridge-vst-hwnd.exe: $(OBJS_UI_VST_HWND) ../libs/theme.a
$(CXX) $^ $(LINK_UI_VST_HWND_FLAGS) -o $@ $(CMD_STRIP) $@
$(CXX) $^ $(LINK_UI_VST_HWND_FLAGS) -o $@

%__vst-hwnd.o: %.cpp CarlaBridgeToolkitQt.moc
$(CXX) $< $(BUILD_UI_VST_HWND_FLAGS) -c -o $@
@@ -362,7 +362,7 @@ OBJS_UI_VST_X11 = CarlaBridgeUI-VST__vst-x11.o \
CarlaBridgeToolkit__vst.o CarlaBridgeToolkitQt__vst-x11.o

carla-bridge-vst-x11: $(OBJS_UI_VST_X11) ../libs/theme.a
$(CXX) $^ $(LINK_UI_VST_X11_FLAGS) -o $@ $(CMD_STRIP) $@
$(CXX) $^ $(LINK_UI_VST_X11_FLAGS) -o $@

%__vst-x11.o: %.cpp CarlaBridgeToolkitQt.moc
$(CXX) $< $(BUILD_UI_VST_X11_FLAGS) -c -o $@
@@ -418,7 +418,7 @@ OBJS_NATIVE += \
endif

carla-bridge-native: $(FILES) $(OBJS_NATIVE)
$(CXX) $(OBJS_NATIVE) $(NATIVE_LINK_FLAGS) -o $@ $(CMD_STRIP) $@
$(CXX) $(OBJS_NATIVE) $(NATIVE_LINK_FLAGS) -o $@

%__native.o: %.cpp
$(CXX) $< $(NATIVE_BUILD_FLAGS) -c -o $@
@@ -461,7 +461,7 @@ OBJS_POSIX32 += \
../libs/rtmempool.posix32.a

carla-bridge-posix32: $(FILES) $(OBJS_POSIX32)
$(CXX) $(OBJS_POSIX32) $(POSIX_LINK_FLAGS) $(POSIX_32BIT_FLAGS) -o $@ $(CMD_STRIP) $@
$(CXX) $(OBJS_POSIX32) $(POSIX_LINK_FLAGS) $(POSIX_32BIT_FLAGS) -o $@

%__posix32.o: %.cpp
$(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_32BIT_FLAGS) -c -o $@
@@ -504,7 +504,7 @@ OBJS_POSIX64 += \
../libs/rtmempool.posix64.a

carla-bridge-posix64: $(FILES) $(OBJS_POSIX64)
$(CXX) $(OBJS_POSIX64) $(POSIX_LINK_FLAGS) $(POSIX_64BIT_FLAGS) -o $@ $(CMD_STRIP) $@
$(CXX) $(OBJS_POSIX64) $(POSIX_LINK_FLAGS) $(POSIX_64BIT_FLAGS) -o $@

%__posix64.o: %.cpp
$(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_64BIT_FLAGS) -c -o $@
@@ -547,7 +547,7 @@ OBJS_WIN32 += \
../libs/rtmempool.win32.a

carla-bridge-win32.exe: $(FILES) $(OBJS_WIN32) ../libs/jackbridge-win32.dll
$(CXX) $(OBJS_WIN32) $(WIN_32BIT_FLAGS) $(WIN_LINK_FLAGS) -ljackbridge-win32 -o $@ $(CMD_STRIP) $@
$(CXX) $(OBJS_WIN32) $(WIN_32BIT_FLAGS) $(WIN_LINK_FLAGS) -ljackbridge-win32 -o $@

%__win32.o: %.cpp
$(CXX) $< $(WIN_BUILD_FLAGS) $(WIN_32BIT_FLAGS) -c -o $@
@@ -590,7 +590,7 @@ OBJS_WIN64 += \
../libs/rtmempool.win64.a

carla-bridge-win64.exe: $(FILES) $(OBJS_WIN64) ../libs/jackbridge-win64.dll
$(CXX) $(OBJS_WIN64) $(WIN_64BIT_FLAGS) $(WIN_LINK_FLAGS) -ljackbridge-win64 -o $@ $(CMD_STRIP) $@
$(CXX) $(OBJS_WIN64) $(WIN_64BIT_FLAGS) $(WIN_LINK_FLAGS) -ljackbridge-win64 -o $@

%__win64.o: %.cpp
$(CXX) $< $(WIN_BUILD_FLAGS) $(WIN_64BIT_FLAGS) -c -o $@


+ 6
- 14
source/discovery/Makefile View File

@@ -10,14 +10,6 @@ include ../Makefile.mk

BUILD_CXX_FLAGS += -I../backend -I../includes -I../modules -I../modules/utils

# ifeq ($(HAVE_QT4),true)
# BUILD_CXX_FLAGS += $(shell pkg-config --cflags QtCore)
# LINK_FLAGS += $(shell pkg-config --libs QtCore)
# else
# BUILD_CXX_FLAGS += $(shell pkg-config --cflags Qt5Core)
# LINK_FLAGS += $(shell pkg-config --libs Qt5Core)
# endif

ifeq ($(CARLA_PLUGIN_SUPPORT),true)
BUILD_CXX_FLAGS += -DWANT_LADSPA -DWANT_DSSI -DWANT_LV2 -DWANT_VST
ifeq ($(CARLA_VESTIGE_HEADER),true)
@@ -90,22 +82,22 @@ win64: carla-discovery-win64.exe
# --------------------------------------------------------------

carla-discovery-native: $(OBJS) $(LIBS)
$(CXX) $^ $(POSIX_BUILD_FLAGS) $(NATIVE_FLAGS) $(POSIX_LINK_FLAGS) -o $@ $(CMD_STRIP) $@
$(CXX) $^ $(POSIX_BUILD_FLAGS) $(NATIVE_FLAGS) $(POSIX_LINK_FLAGS) -o $@

carla-discovery-native.exe: $(OBJS) $(LIBS)
$(CXX) $^ $(WIN_BUILD_FLAGS) $(NATIVE_FLAGS) $(WIN_LINK_FLAGS) -o $@ $(CMD_STRIP) $@
$(CXX) $^ $(WIN_BUILD_FLAGS) $(NATIVE_FLAGS) $(WIN_LINK_FLAGS) -o $@

carla-discovery-posix32: $(OBJS) $(LIBS_posix32)
$(CXX) $^ $(POSIX_BUILD_FLAGS) $(POSIX_32BIT_FLAGS) $(POSIX_LINK_FLAGS) -o $@ $(CMD_STRIP) $@
$(CXX) $^ $(POSIX_BUILD_FLAGS) $(POSIX_32BIT_FLAGS) $(POSIX_LINK_FLAGS) -o $@

carla-discovery-posix64: $(OBJS) $(LIBS_posix64)
$(CXX) $^ $(POSIX_BUILD_FLAGS) $(POSIX_64BIT_FLAGS) $(POSIX_LINK_FLAGS) -o $@ $(CMD_STRIP) $@
$(CXX) $^ $(POSIX_BUILD_FLAGS) $(POSIX_64BIT_FLAGS) $(POSIX_LINK_FLAGS) -o $@

carla-discovery-win32.exe: $(OBJS) $(LIBS_win32)
$(CXX) $^ $(WIN_BUILD_FLAGS) $(WIN_32BIT_FLAGS) $(WIN_LINK_FLAGS) -o $@ $(CMD_STRIP) $@
$(CXX) $^ $(WIN_BUILD_FLAGS) $(WIN_32BIT_FLAGS) $(WIN_LINK_FLAGS) -o $@

carla-discovery-win64.exe: $(OBJS) $(LIBS_win64)
$(CXX) $^ $(WIN_BUILD_FLAGS) $(WIN_64BIT_FLAGS) $(WIN_LINK_FLAGS) -o $@ $(CMD_STRIP) $@
$(CXX) $^ $(WIN_BUILD_FLAGS) $(WIN_64BIT_FLAGS) $(WIN_LINK_FLAGS) -o $@

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



+ 3
- 3
source/modules/distrho/dgl/Makefile View File

@@ -99,13 +99,13 @@ win64: ../../dgl.win64.a
$(AR) rs $@ $^

../../dgl.dll: $(OBJS)
$(CXX) $^ -shared $(LINK_FLAGS) -lopengl32 -lgdi32 -o $@ $(CMD_STRIP) $@
$(CXX) $^ -shared $(LINK_FLAGS) -lopengl32 -lgdi32 -o $@

../../dgl.dylib: $(OBJS)
$(CXX) $^ -dynamiclib $(LINK_FLAGS) -framework OpenGL -framework Cocoa -o $@ $(CMD_STRIP) $@
$(CXX) $^ -dynamiclib $(LINK_FLAGS) -framework OpenGL -framework Cocoa -o $@

../../dgl.so: $(OBJS)
$(CXX) $^ -shared $(LINK_FLAGS) -lGL -lX11 -o $@ $(CMD_STRIP) $@
$(CXX) $^ -shared $(LINK_FLAGS) -lGL -lX11 -o $@

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



+ 4
- 4
source/modules/jackbridge/Makefile View File

@@ -53,16 +53,16 @@ JackBridge%.w64.o: JackBridge%.cpp
# --------------------------------------------------------------

../jackbridge-win32.dll: $(OBJS)
$(CXX) $^ $(WIN_BUILD_FLAGS) $(WIN_32BIT_FLAGS) $(WIN_LINK_FLAGS) -Wl,--output-def,$@.def,--out-implib,$@.a -o $@ $(CMD_STRIP) $@
$(CXX) $^ $(WIN_BUILD_FLAGS) $(WIN_32BIT_FLAGS) $(WIN_LINK_FLAGS) -Wl,--output-def,$@.def,--out-implib,$@.a -o $@

../jackbridge-win64.dll: $(OBJS)
$(CXX) $^ $(WIN_BUILD_FLAGS) $(WIN_64BIT_FLAGS) $(WIN_LINK_FLAGS) -Wl,--output-def,$@.def,--out-implib,$@.a -o $@ $(CMD_STRIP) $@
$(CXX) $^ $(WIN_BUILD_FLAGS) $(WIN_64BIT_FLAGS) $(WIN_LINK_FLAGS) -Wl,--output-def,$@.def,--out-implib,$@.a -o $@

../jackbridge-win32.dll.so: $(OBJSw32) ../jackbridge-win32.dll.def
$(WINECXX) $^ $(WINE_32BIT_FLAGS) $(WINE_LINK_FLAGS) -o $@ $(CMD_STRIP) $@
$(WINECXX) $^ $(WINE_32BIT_FLAGS) $(WINE_LINK_FLAGS) -o $@

../jackbridge-win64.dll.so: $(OBJS) ../jackbridge-win64.dll.def
$(WINECXX) $^ $(WINE_64BIT_FLAGS) $(WINE_LINK_FLAGS) -o $@ $(CMD_STRIP) $@
$(WINECXX) $^ $(WINE_64BIT_FLAGS) $(WINE_LINK_FLAGS) -o $@

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



+ 3
- 3
source/modules/juce_core/Makefile View File

@@ -51,13 +51,13 @@ win64: ../juce_core.win64.a
$(AR) rs $@ $^

../juce_core.dll: $(OBJS)
$(CXX) $^ -shared $(LINK_FLAGS) -o $@ $(CMD_STRIP) $@
$(CXX) $^ -shared $(LINK_FLAGS) -o $@

../juce_core.dylib: $(OBJS)
$(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@ $(CMD_STRIP) $@
$(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@

../juce_core.so: $(OBJS)
$(CXX) $^ -shared $(LINK_FLAGS) -o $@ $(CMD_STRIP) $@
$(CXX) $^ -shared $(LINK_FLAGS) -o $@

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



+ 3
- 3
source/modules/lilv/Makefile View File

@@ -49,13 +49,13 @@ win64: ../lilv.win64.a
$(AR) rs $@ $^

../lilv.dll: $(OBJS)
$(CXX) $^ -shared $(LINK_FLAGS) -o $@ $(CMD_STRIP) $@
$(CXX) $^ -shared $(LINK_FLAGS) -o $@

../lilv.dylib: $(OBJS)
$(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@ $(CMD_STRIP) $@
$(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@

../lilv.so: $(OBJS)
$(CXX) $^ -shared $(LINK_FLAGS) -o $@ $(CMD_STRIP) $@
$(CXX) $^ -shared $(LINK_FLAGS) -o $@

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



+ 3
- 3
source/modules/rtmempool/Makefile View File

@@ -49,13 +49,13 @@ win64: ../rtmempool.win64.a
$(AR) rs $@ $^

../rtmempool.dll: $(OBJS)
$(CXX) $^ -shared $(LINK_FLAGS) -o $@ $(CMD_STRIP) $@
$(CXX) $^ -shared $(LINK_FLAGS) -o $@

../rtmempool.dylib: $(OBJS)
$(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@ $(CMD_STRIP) $@
$(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@

../rtmempool.so: $(OBJS)
$(CXX) $^ -shared $(LINK_FLAGS) -o $@ $(CMD_STRIP) $@
$(CXX) $^ -shared $(LINK_FLAGS) -o $@

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



+ 3
- 3
source/modules/theme/Makefile View File

@@ -106,13 +106,13 @@ win64: ../theme.win64.a
$(AR) rs $@ $(OBJS_win64)

../carlastyle.dll: $(FILES) $(OBJS_shared)
$(CXX) $(OBJS_shared) -shared $(LINK_FLAGS) -o $@ $(CMD_STRIP) $@
$(CXX) $(OBJS_shared) -shared $(LINK_FLAGS) -o $@

../carlastyle.dynlib: $(FILES) $(OBJS_shared)
$(CXX) $(OBJS_shared) -dynamiclib $(LINK_FLAGS) -o $@ $(CMD_STRIP) $@
$(CXX) $(OBJS_shared) -dynamiclib $(LINK_FLAGS) -o $@

../carlastyle.so: $(FILES) $(OBJS_shared)
$(CXX) $(OBJS_shared) -shared $(LINK_FLAGS) -o $@ $(CMD_STRIP) $@
$(CXX) $(OBJS_shared) -shared $(LINK_FLAGS) -o $@

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



Loading…
Cancel
Save