diff options
| author | Jakob Odersky <jodersky@gmail.com> | 2014-04-15 23:52:40 +0200 |
|---|---|---|
| committer | Jakob Odersky <jodersky@gmail.com> | 2014-04-15 23:52:40 +0200 |
| commit | 975a07373e4ffe5ff269675bc8da896e60f84427 (patch) | |
| tree | efd7c87b086c1a8a5643b3939b50086b1ae05f01 /flow-native | |
| parent | 416aacf8940ba0f281a3d7afb90f27b3ae99e664 (diff) | |
| download | akka-serial-975a07373e4ffe5ff269675bc8da896e60f84427.tar.gz akka-serial-975a07373e4ffe5ff269675bc8da896e60f84427.tar.bz2 akka-serial-975a07373e4ffe5ff269675bc8da896e60f84427.zip | |
reorganize build
Diffstat (limited to 'flow-native')
| -rw-r--r-- | flow-native/Makefile.mac | 12 | ||||
| -rw-r--r-- | flow-native/flow/flow_jni.c (renamed from flow-native/flow_jni.c) | 0 | ||||
| -rw-r--r-- | flow-native/mac/Makefile | 12 | ||||
| -rw-r--r-- | flow-native/mac/Readme | 2 | ||||
| -rw-r--r-- | flow-native/platform/posix/flow.c (renamed from flow-native/posix/flow.c) | 0 | ||||
| -rw-r--r-- | flow-native/platform/windows/README (renamed from flow-native/windows/README) | 0 | ||||
| -rw-r--r-- | flow-native/platform/windows/flow.c.disabled (renamed from flow-native/windows/flow.c.disabled) | 0 |
7 files changed, 12 insertions, 14 deletions
diff --git a/flow-native/Makefile.mac b/flow-native/Makefile.mac new file mode 100644 index 0000000..03418e7 --- /dev/null +++ b/flow-native/Makefile.mac @@ -0,0 +1,12 @@ +# Include common settings +include ../common.mk + +JAVALIB=lib$(NAME)$(MAJOR).dylib + +all: $(JAVALIB) + +$(JAVALIB): + gcc -dynamiclib -I$(JAVA_HOME)/include/darwin -I$(JAVA_HOME)/include -I../include ../flow_jni.c ../posix/flow.c -o $(JAVALIB) -m64 + +clean: + -del $(JAVALIB)
\ No newline at end of file diff --git a/flow-native/flow_jni.c b/flow-native/flow/flow_jni.c index 8ec2aed..8ec2aed 100644 --- a/flow-native/flow_jni.c +++ b/flow-native/flow/flow_jni.c diff --git a/flow-native/mac/Makefile b/flow-native/mac/Makefile deleted file mode 100644 index 0f73b68..0000000 --- a/flow-native/mac/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# Include common settings -include ../common.mk - -JAVALIB=lib$(NAME)$(MAJOR).dylib - -all: $(JAVALIB) - -$(JAVALIB): - gcc -dynamiclib -I$(JAVA_HOME)/include/darwin -I$(JAVA_HOME)/include -I../include ../flow_jni.c ../posix/flow.c -o $(JAVALIB) -m64 - -clean: - -del $(JAVALIB)
\ No newline at end of file diff --git a/flow-native/mac/Readme b/flow-native/mac/Readme deleted file mode 100644 index 6df640b..0000000 --- a/flow-native/mac/Readme +++ /dev/null @@ -1,2 +0,0 @@ -You should be able to build on OSX by just running make in this directory. -The libFlow3.dylib file produced will have to be copied manually into the classpath of your project
\ No newline at end of file diff --git a/flow-native/posix/flow.c b/flow-native/platform/posix/flow.c index 1adb10c..1adb10c 100644 --- a/flow-native/posix/flow.c +++ b/flow-native/platform/posix/flow.c diff --git a/flow-native/windows/README b/flow-native/platform/windows/README index 3d24410..3d24410 100644 --- a/flow-native/windows/README +++ b/flow-native/platform/windows/README diff --git a/flow-native/windows/flow.c.disabled b/flow-native/platform/windows/flow.c.disabled index 86a267c..86a267c 100644 --- a/flow-native/windows/flow.c.disabled +++ b/flow-native/platform/windows/flow.c.disabled |