Browse Source

add setenv_* scripts (VSVR_BASE_DIR, VST2_SDK_DIR); fix library link order on Linux

pull/1639/head
bsp2 6 years ago
parent
commit
86e0c77222
12 changed files with 27 additions and 19 deletions
  1. +3
    -3
      dep/yac/sharedlib_linux.mk
  2. +1
    -1
      dep/yac/sharedlib_msvc.mk
  3. +1
    -1
      dep/yac/staticlib_linux.mk
  4. +1
    -1
      dep/yac/staticlib_msvc.mk
  5. +1
    -0
      makefile_lib.linux
  6. +5
    -0
      setenv_linux.sh
  7. +5
    -0
      setenv_msvc.sh
  8. +5
    -3
      vst2_common_linux.mk
  9. +0
    -1
      vst2_common_linux_post.mk
  10. +1
    -3
      vst2_common_linux_pre.mk
  11. +3
    -2
      vst2_common_msvc.mk
  12. +1
    -4
      vst2_common_msvc_pre.mk

+ 3
- 3
dep/yac/sharedlib_linux.mk View File

@@ -11,9 +11,9 @@ ifeq ("$(TARGET)","")
TARGET=$(TARGET_BASENAME).so
endif

CPPFLAGS += -fPIC -I"dep/yac" $(EXTRAFLAGS)
CFLAGS += -fPIC -I"dep/yac" $(EXTRAFLAGS)
EXTRALIBS += -L$(CROSS_ROOT)/usr/lib -lm
CPPFLAGS += -fPIC -I"$(VSVR_BASE_DIR)/dep/yac" $(EXTRAFLAGS)
CFLAGS += -fPIC -I"$(VSVR_BASE_DIR)/dep/yac" $(EXTRAFLAGS)
EXTRALIBS += -L$(CROSS_ROOT)/usr/lib -lm -lpthread

###########include sharedlib_common_gcc.mk
#


+ 1
- 1
dep/yac/sharedlib_msvc.mk View File

@@ -29,7 +29,7 @@ endif

#

CPPFLAGS += -I"dep/yac" -DWIN32 $(EXTRAFLAGS)
CPPFLAGS += -I"$(VSVR_BASE_DIR)/dep/yac" -DWIN32 $(EXTRAFLAGS)
# -DYAC_FORCE_NO_TLS
EXTRALIBS += -DLL -MAP



+ 1
- 1
dep/yac/staticlib_linux.mk View File

@@ -25,7 +25,7 @@ ifeq ("$(TARGET)","")
TARGET=$(TARGET_BASENAME).a
endif

CPPFLAGS += -I"/f/git/VeeSeeVSTRack/dep/yac" -DLINUX $(EXTRAFLAGS)
CPPFLAGS += -I"$(VSVR_BASE_DIR)/dep/yac/" -DLINUX $(EXTRAFLAGS)
# -DYAC_FORCE_NO_TLS
EXTRALIBS +=



+ 1
- 1
dep/yac/staticlib_msvc.mk View File

@@ -25,7 +25,7 @@ ifeq ("$(TARGET)","")
TARGET=$(TARGET_BASENAME).lib
endif

CPPFLAGS += -I"/f/git/VeeSeeVSTRack/dep/yac" -DWIN32 $(EXTRAFLAGS)
CPPFLAGS += -I"$(VSVR_BASE_DIR)/dep/yac" -DWIN32 $(EXTRAFLAGS)
# -DYAC_FORCE_NO_TLS
EXTRALIBS +=
#-DLL -MAP


+ 1
- 0
makefile_lib.linux View File

@@ -8,6 +8,7 @@ include dep/yac/install_linux.mk
TARGET_BASENAME=Rack

EXTRAFLAGS= -DVERSION=0.6.1 -DARCH_LIN -D_USE_MATH_DEFINES -DRACK_HOST -DUSE_VST2 -Iinclude/ -Idep/include -Idep/
EXTRAFLAGS+= -DSKIP_STATIC_MODULES

# for osdialog:
EXTRAFLAGS+= `pkg-config gtk+-2.0 --cflags`


+ 5
- 0
setenv_linux.sh View File

@@ -0,0 +1,5 @@

export VSVR_BASE_DIR=`pwd`

# this must point to the directory which contains the 'aeffect.h' and 'aeffectx.h' files
export VST2_SDK_DIR=/mnt/dev/vstsdk2.4/pluginterfaces/vst2.x/

+ 5
- 0
setenv_msvc.sh View File

@@ -0,0 +1,5 @@

export VSVR_BASE_DIR=`pwd`

# this must point to the directory which contains the 'aeffect.h' and 'aeffectx.h' files
export VST2_SDK_DIR=/f/dev/vstsdk2.4/pluginterfaces/vst2.x/

+ 5
- 3
vst2_common_linux.mk View File

@@ -4,11 +4,13 @@
#

EXTRAFLAGS+= -DVERSION=0.6.1 -D_USE_MATH_DEFINES -Iinclude/ -Idep/include -Idep/ -DUSE_VST2
# -DSKIP_STATIC_MODULES

include vst2_common_linux_pre.mk
## note: remove -DSKIP_STATIC_MODULES in makefile_lib.linux and uncomment the following line to link the add-on modules
#include vst2_common_staticlibs.mk

EXTRALIBS+= Rack.a

include vst2_common_staticlibs.mk
include vst2_common_linux_pre.mk

PLAF_OBJ=



+ 0
- 1
vst2_common_linux_post.mk View File

@@ -1,3 +1,2 @@
EXTRALIBS+= Rack.a

include dep/yac/sharedlib_linux.mk

+ 1
- 3
vst2_common_linux_pre.mk View File

@@ -1,7 +1,5 @@
EXTRAFLAGS+= -DARCH_LIN
EXTRAFLAGS+= -I../../dev/vstsdk2.4/pluginterfaces/vst2.x/

EXTRALIBS=
EXTRAFLAGS+= -I"$(VST2_SDK_DIR)"

ifeq ($(BUILD_64),y)
EXTRALIBS_DEP= dep/lib/linux_gcc/x64


+ 3
- 2
vst2_common_msvc.mk View File

@@ -4,11 +4,12 @@
#

EXTRAFLAGS+= -DVERSION=0.6.1 -D_USE_MATH_DEFINES -Iinclude/ -Idep/include -Idep/ -DUSE_VST2

include vst2_common_msvc_pre.mk
# -DSKIP_STATIC_MODULES

include vst2_common_staticlibs.mk

include vst2_common_msvc_pre.mk

PLAF_OBJ=

include make.objects


+ 1
- 4
vst2_common_msvc_pre.mk View File

@@ -1,8 +1,6 @@
EXTRAFLAGS+= -DARCH_WIN
EXTRAFLAGS+= -DVST2_REPARENT_WINDOW_HACK
EXTRAFLAGS+= -I../../dev/vstsdk2.4/pluginterfaces/vst2.x/

EXTRALIBS=
EXTRAFLAGS+= -I"$(VST2_SDK_DIR)"

ifeq ($(BUILD_64),y)
EXTRALIBS+= -LIBPATH:dep/lib/msvc/x64
@@ -11,6 +9,5 @@ EXTRALIBS+= -LIBPATH:dep/lib/msvc/x86
endif

EXTRALIBS+= libspeexdsp.lib glew.lib opengl32.lib gdi32.lib user32.lib kernel32.lib Comdlg32.lib Shell32.lib ws2_32.lib winmm.lib ole32.lib
#glfw.lib

plugin_lib = $(PLUGIN_DIR)/$(1)/$(1).lib

Loading…
Cancel
Save