Merge with develop

This commit is contained in:
kervala 2016-01-26 23:43:34 +01:00
parent 0f3a4cb78e
commit 8083f47f35
4 changed files with 0 additions and 16 deletions

View file

@ -4,13 +4,9 @@ ADD_EXECUTABLE(build_rbank ${SRC})
ADD_DEFINITIONS(-DNL_BRB_CFG="\\"${NL_ETC_PREFIX}/\\"") ADD_DEFINITIONS(-DNL_BRB_CFG="\\"${NL_ETC_PREFIX}/\\"")
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(build_rbank nelpacs nel3d nelligo nelmisc) TARGET_LINK_LIBRARIES(build_rbank nelpacs nel3d nelligo nelmisc)
NL_DEFAULT_PROPS(build_rbank "NeL, Tools, PACS: build_rbank") NL_DEFAULT_PROPS(build_rbank "NeL, Tools, PACS: build_rbank")
NL_ADD_RUNTIME_FLAGS(build_rbank) NL_ADD_RUNTIME_FLAGS(build_rbank)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS build_rbank RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT toolspacs) INSTALL(TARGETS build_rbank RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT toolspacs)
INSTALL(FILES build_rbank.cfg DESTINATION ${NL_ETC_PREFIX} COMPONENT toolspacs) INSTALL(FILES build_rbank.cfg DESTINATION ${NL_ETC_PREFIX} COMPONENT toolspacs)

View file

@ -2,10 +2,6 @@ FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(build_samplebank ${SRC}) ADD_EXECUTABLE(build_samplebank ${SRC})
ADD_DEFINITIONS( ${LIBXML2_DEFINITIONS})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(build_samplebank nelmisc nelsound) TARGET_LINK_LIBRARIES(build_samplebank nelmisc nelsound)
NL_DEFAULT_PROPS(build_samplebank "NeL, Tools, Sound: build_samplebank") NL_DEFAULT_PROPS(build_samplebank "NeL, Tools, Sound: build_samplebank")
NL_ADD_RUNTIME_FLAGS(build_samplebank) NL_ADD_RUNTIME_FLAGS(build_samplebank)

View file

@ -2,10 +2,6 @@ FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(build_sound ${SRC}) ADD_EXECUTABLE(build_sound ${SRC})
ADD_DEFINITIONS( ${LIBXML2_DEFINITIONS})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(build_sound nelmisc nelsound) TARGET_LINK_LIBRARIES(build_sound nelmisc nelsound)
NL_DEFAULT_PROPS(build_sound "NeL, Tools, Sound: build_sound") NL_DEFAULT_PROPS(build_sound "NeL, Tools, Sound: build_sound")
NL_ADD_RUNTIME_FLAGS(build_sound) NL_ADD_RUNTIME_FLAGS(build_sound)

View file

@ -2,10 +2,6 @@ FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(build_soundbank ${SRC}) ADD_EXECUTABLE(build_soundbank ${SRC})
ADD_DEFINITIONS( ${LIBXML2_DEFINITIONS})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(build_soundbank nelmisc nelsound) TARGET_LINK_LIBRARIES(build_soundbank nelmisc nelsound)
NL_DEFAULT_PROPS(build_soundbank "NeL, Tools, Sound: build_soundbank") NL_DEFAULT_PROPS(build_soundbank "NeL, Tools, Sound: build_soundbank")
NL_ADD_RUNTIME_FLAGS(build_soundbank) NL_ADD_RUNTIME_FLAGS(build_soundbank)