From f61683e57d6299e1dc2707ebe4f4c4b8cd086ef3 Mon Sep 17 00:00:00 2001
From: nathan <nathan@dorkbox.com>
Date: Thu, 22 Jan 2015 02:22:33 +0100
Subject: [PATCH] Updated build system. Tested on linux64/windows32

---
 make_common.mak  | 7 +++++--
 make_linux.mak   | 9 +++++----
 make_macosx.mak  | 8 ++++----
 make_windows.mak | 6 +++---
 udt-doc/Makefile | 7 -------
 5 files changed, 17 insertions(+), 20 deletions(-)
 delete mode 100644 udt-doc/Makefile

diff --git a/make_common.mak b/make_common.mak
index c97958b..20389c5 100644
--- a/make_common.mak
+++ b/make_common.mak
@@ -8,10 +8,13 @@
 #
 ################################################################################
 
-DEPLOY_PATH=../../java_builder/ProjectBuilder/deploy
-TARGET_PATH=../../resources/JavaLauncher
+# 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.1.1
+TARGET_PATH=../../resources/Dependencies/barchart-udt
 JVM=jvm
 
+
 #setup architecture and path parameters
 ifeq ($(COMPILE_OS_ARCH),32)
   CCFLAGS +=-DI386
diff --git a/make_linux.mak b/make_linux.mak
index 2ef3509..51d7edb 100644
--- a/make_linux.mak
+++ b/make_linux.mak
@@ -11,11 +11,11 @@
 
 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)
 
 CPP=g++
-CC=gcc
+STRIP=strip
 
 LDFLAGS = -shared
 LIBS = -lpthread -ldl -lm 
@@ -27,8 +27,9 @@ CCFLAGS += \
 
 all: dist-clean udt
 	@echo "\nDONE WITH COMPILE...."
-	@mkdir -p "bin/$(DIST_OS_NAME)"
-	@mv "$(DIST_NAME)" "bin/$(DIST_OS_NAME)"
+	$(STRIP) --strip-debug --strip-unneeded $(DIST_NAME)
+	@mkdir -p "$(TARGET_PATH)/$(DIST_OS_NAME)"
+	@mv "$(DIST_NAME)" "$(TARGET_PATH)/$(DIST_OS_NAME)"
 	@# now cleanup
 	@$(MAKE) -s -f make_common.mak clean
 
diff --git a/make_macosx.mak b/make_macosx.mak
index 0230bcf..1061a29 100644
--- a/make_macosx.mak
+++ b/make_macosx.mak
@@ -13,11 +13,11 @@
 
 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)
 
 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
 LIBS = -lpthread -lm
@@ -34,8 +34,8 @@ CCFLAGS += -DMACOSX
 
 all: dist-clean udt
 	@echo "\nDONE WITH COMPILE...."
-	@mkdir -p "bin/$(DIST_OS_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
 	@$(MAKE) -s -f make_common.mak clean
 
diff --git a/make_windows.mak b/make_windows.mak
index ad3bda5..4a64fbb 100644
--- a/make_windows.mak
+++ b/make_windows.mak
@@ -10,7 +10,7 @@
 
 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)
 
 ifeq ($(COMPILE_OS_ARCH),32)
@@ -45,7 +45,7 @@ all: dist-clean udt
 	@# now cleanup
 	@# now strip the DLL of unneeded, since it can be HUGE
 	$(STRIP) --strip-debug --strip-unneeded $(DIST_NAME)
-	@mkdir -p "bin/$(DIST_OS_NAME)"
-	@mv "$(DIST_NAME)" "bin/$(DIST_OS_NAME)"
+	@mkdir -p "$(TARGET_PATH)/$(DIST_OS_NAME)"
+	@mv "$(DIST_NAME)" "$(TARGET_PATH)/$(DIST_OS_NAME)"
 	@$(MAKE) -s -f make_common.mak clean
 
diff --git a/udt-doc/Makefile b/udt-doc/Makefile
deleted file mode 100644
index 589c4a2..0000000
--- a/udt-doc/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-DIRS = src app
-TARGETS = all clean install
-
-$(TARGETS): %: $(patsubst %, %.%, $(DIRS))
-
-$(foreach TGT, $(TARGETS), $(patsubst %, %.$(TGT), $(DIRS))):
-	$(MAKE) -C $(subst ., , $@)