Added CMake, removed java bits from build

master
nathan 2017-12-03 00:17:23 +01:00
parent d35bbc84dc
commit 1f2cfec1ab
2 changed files with 42 additions and 11 deletions

39
CMakeLists.txt Normal file
View File

@ -0,0 +1,39 @@
PROJECT( udt )
cmake_minimum_required(VERSION 2.8.0 FATAL_ERROR)
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
add_definitions(-D_DEBUG)
endif()
add_definitions(
-Wall
-D__UNIX
-DPOSIX_C_SOURCE
-DGNU_SOURCE
-Wno-unused-function
-std=c++11
)
SET(LIBRARIES
pthread
m
${ARCAN_SHMIF_LIBRARY}
)
set(SOURCES
src/api.cpp
src/buffer.cpp
src/cache.cpp
src/ccc.cpp
src/channel.cpp
src/core.cpp
src/epoll.cpp
src/list.cpp
src/md5.cpp
src/packet.cpp
src/queue.cpp
src/udtCommon.cpp
src/window.cpp
)
add_library(${PROJECT_NAME} ${SOURCES})

View File

@ -24,10 +24,8 @@
######################################################################
# Note that we are ONLY updating the JNI binaries, NOT THE JAVA CODE. So you will want to replace the appropriate files
# inside the bundle jar.
CORE_NAME=libbarchart-udt-core-2.3.2
TARGET_PATH=../../dorkbox/Dorkbox-Network/natives
CORE_NAME=libudt-2.3.2
TARGET_PATH=dist
JVM=jvm
@ -74,20 +72,14 @@ endif
#common path includes
CCFLAGS += \
-isystem$(JVM)/include \
-isystem$(JVM)/include/$(COMPILE_OS) \
-Isrc/
JNI_OBJS = com_barchart_udt_CCC.o com_barchart_udt_SocketUDT.o JNICCC.o JNICCCFactory.o JNIHelpers.o
UDT_OBJS = api.o buffer.o cache.o ccc.o channel.o udtCommon.o core.o epoll.o list.o md5.o packet.o queue.o window.o
$(JNI_OBJS): %.o: src/jni/%.cpp src/jni/%.h
@$(CPP) $(CCFLAGS) $< -c
$(UDT_OBJS): %.o: src/%.cpp src/%.h src/udt.h
@$(CPP) $(CCFLAGS) $< -c
lib: $(UDT_OBJS) $(JNI_OBJS)
lib: $(UDT_OBJS)
@$(CPP) $(CCFLAGS) $(LDFLAGS) -o $(DIST_NAME) $^ $(LIBS)
udt: lib