Moved musikcore_c.h and friends into core proper.

This commit is contained in:
casey langen 2020-01-28 21:14:01 -08:00
parent aff52e88e8
commit cfa968ff42
8 changed files with 6 additions and 26 deletions

View File

@ -93,7 +93,6 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
endif()
add_subdirectory(src/core)
add_subdirectory(src/core_c)
add_subdirectory(src/core_c_demo)
add_subdirectory(src/musikcube)
add_subdirectory(src/musikcubed)

View File

@ -1,4 +1,6 @@
set(CORE_SOURCES
./c_context.cpp
./c_interface_wrappers.cpp
./debug.cpp
./audio/Buffer.cpp
./audio/Crossfader.cpp
@ -70,6 +72,8 @@ include_directories(
../3rdparty/include/sqlite
)
add_definitions(-DMCSDK_DEFINE_EXPORTS)
add_library(musikcore SHARED ${CORE_SOURCES})
set_target_properties(musikcore PROPERTIES

View File

@ -1,18 +0,0 @@
set(CORE_C_SOURCES
context.cpp
interface_wrappers.cpp
)
include_directories(
.
..
)
add_definitions(-DMCSDK_DEFINE_EXPORTS)
add_library(musikcore_c SHARED ${CORE_C_SOURCES})
set_target_properties(musikcore_c PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${musikcube_SOURCE_DIR}/bin)
target_link_libraries(musikcore_c ${musikcube_LINK_LIBS} musikcore)

View File

@ -11,9 +11,4 @@ add_executable(core_c_demo ${CORE_C_DEMO_SRCS})
set_target_properties(core_c_demo PROPERTIES LINK_FLAGS "-Wl,-rpath,./")
if (${LINK_STATICALLY} MATCHES "true")
find_library(EVLIB NAMES libev.a ev)
target_link_libraries(core_c_demo ${musikcube_LINK_LIBS} ${EVLIB} musikcore musikcore_c)
else()
target_link_libraries(core_c_demo ${musikcube_LINK_LIBS} musikcore musikcore_c ev)
endif()
target_link_libraries(core_c_demo ${musikcube_LINK_LIBS} musikcore)

View File

@ -1,7 +1,7 @@
#include <stdio.h>
#include <unistd.h>
#include <core_c/musikcore_c.h>
#include <core/musikcore_c.h>
#define INPUT_FILE "/home/clangen/in.opus"
#define OUTPUT_FILE "/home/clangen/out.flac"