dorkbox
/
UDT
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Updated build system. Tested on linux64/windows32

This commit is contained in:
nathan 2015-01-22 02:22:33 +01:00
parent 8f3dcde8b6
commit f61683e57d
5 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
make_common.mak
View File

@ -8,10 +8,13 @@
# #
################################################################################ ################################################################################
DEPLOY_PATH=../../java_builder/ProjectBuilder/deploy # Note that we are ONLY updating the JNI binaries, NOT THE JAVA CODE. So you will want to replace the appropriate files
TARGET_PATH=../../resources/JavaLauncher # inside the bundle jar.
CORE_NAME=libbarchart-udt-core-2.3.1.1
TARGET_PATH=../../resources/Dependencies/barchart-udt
JVM=jvm JVM=jvm
#setup architecture and path parameters #setup architecture and path parameters
ifeq ($(COMPILE_OS_ARCH),32) ifeq ($(COMPILE_OS_ARCH),32)
CCFLAGS +=-DI386 CCFLAGS +=-DI386

9
make_linux.mak
View File

@ -11,11 +11,11 @@
include make_common.mak include make_common.mak
DIST_NAME=libbarchart-udt-core-2.3.1-mod.so DIST_NAME=$(CORE_NAME).so
DIST_PATH=windows_$(COMPILE_OS_ARCH) DIST_PATH=windows_$(COMPILE_OS_ARCH)
CPP=g++ CPP=g++
CC=gcc STRIP=strip
LDFLAGS = -shared LDFLAGS = -shared
LIBS = -lpthread -ldl -lm LIBS = -lpthread -ldl -lm
@ -27,8 +27,9 @@ CCFLAGS += \
all: dist-clean udt all: dist-clean udt
@echo "\nDONE WITH COMPILE...." @echo "\nDONE WITH COMPILE...."
@mkdir -p "bin/$(DIST_OS_NAME)" $(STRIP) --strip-debug --strip-unneeded $(DIST_NAME)
@mv "$(DIST_NAME)" "bin/$(DIST_OS_NAME)" @mkdir -p "$(TARGET_PATH)/$(DIST_OS_NAME)"
@mv "$(DIST_NAME)" "$(TARGET_PATH)/$(DIST_OS_NAME)"
@# now cleanup @# now cleanup
@$(MAKE) -s -f make_common.mak clean @$(MAKE) -s -f make_common.mak clean

8
make_macosx.mak
View File

@ -13,11 +13,11 @@
include make_common.mak include make_common.mak
DIST_NAME=libbarchart-udt-core-2.3.1-mod.dylib DIST_NAME=$(CORE_NAME).dylib
DIST_PATH=windows_$(COMPILE_OS_ARCH) DIST_PATH=windows_$(COMPILE_OS_ARCH)
CPP=i686-apple-darwin10-g++ CPP=i686-apple-darwin10-g++
CC=i686-apple-darwin10-gcc STRIP=i686-apple-darwin10-strip
LDFLAGS = -shared -dynamiclib -compatibility_version 1.0 -current_version 1.0 -mmacosx-version-min=10.5 LDFLAGS = -shared -dynamiclib -compatibility_version 1.0 -current_version 1.0 -mmacosx-version-min=10.5
LIBS = -lpthread -lm LIBS = -lpthread -lm
@ -34,8 +34,8 @@ CCFLAGS += -DMACOSX
all: dist-clean udt all: dist-clean udt
@echo "\nDONE WITH COMPILE...." @echo "\nDONE WITH COMPILE...."
@mkdir -p "bin/$(DIST_OS_NAME)" @mkdir -p "$(TARGET_PATH)/$(DIST_OS_NAME)"
@mv "$(DIST_NAME)" "bin/$(DIST_OS_NAME)" @mv "$(DIST_NAME)" "$(TARGET_PATH)/$(DIST_OS_NAME)"
@# now cleanup @# now cleanup
@$(MAKE) -s -f make_common.mak clean @$(MAKE) -s -f make_common.mak clean

6
make_windows.mak
View File

@ -10,7 +10,7 @@
include make_common.mak include make_common.mak
DIST_NAME=libbarchart-udt-core-2.3.1-mod.dll DIST_NAME=$(CORE_NAME).dll
DIST_PATH=windows_$(COMPILE_OS_ARCH) DIST_PATH=windows_$(COMPILE_OS_ARCH)
ifeq ($(COMPILE_OS_ARCH),32) ifeq ($(COMPILE_OS_ARCH),32)
@ -45,7 +45,7 @@ all: dist-clean udt
@# now cleanup @# now cleanup
@# now strip the DLL of unneeded, since it can be HUGE @# now strip the DLL of unneeded, since it can be HUGE
$(STRIP) --strip-debug --strip-unneeded $(DIST_NAME) $(STRIP) --strip-debug --strip-unneeded $(DIST_NAME)
@mkdir -p "bin/$(DIST_OS_NAME)" @mkdir -p "$(TARGET_PATH)/$(DIST_OS_NAME)"
@mv "$(DIST_NAME)" "bin/$(DIST_OS_NAME)" @mv "$(DIST_NAME)" "$(TARGET_PATH)/$(DIST_OS_NAME)"
@$(MAKE) -s -f make_common.mak clean @$(MAKE) -s -f make_common.mak clean

7
udt-doc/Makefile
View File

@ -1,7 +0,0 @@
DIRS = src app
TARGETS = all clean install
$(TARGETS): %: $(patsubst %, %.%, $(DIRS))
$(foreach TGT, $(TARGETS), $(patsubst %, %.$(TGT), $(DIRS))):
$(MAKE) -C $(subst ., , $@)