Commit e42bd7e6 authored by Andreas Tille's avatar Andreas Tille
Browse files

New upstream version 18.09~pre1+git20180827.fe4953e+dfsg

parent f3b7a867

source/c/compile_windows_x64.mak→source/c/Makefile_Win64.mak

+3 −3
Original line number Diff line number Diff line
@@ -6,13 +6,13 @@ 
#============================================================================



# Visual C++ directory, for example

VCPPDIR=C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC

VCPPDIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC



# Directory where JDK is installed (We require JDK 1.6)

JAVADIR=C:\Program Files\Java\jdk1.6.0_37

JAVADIR=C:\Program Files\Java\jdk1.8.0_181



# Common parent directory

PARENTDIR=C:\nativeData

PARENTDIR=F:\base



# Directory of the HDF Java Products, for example

SRCDIR=$(PARENTDIR)\c\

source/c/compile_linux_amd64.sh

+3 −2
Original line number Diff line number Diff line 
#! /bin/bash



gcc -shared -O3 -fPIC unix.c -I/usr/java/jdk1.6.0/include -I/usr/java/jdk1.6.0/include/linux -o libunix.so

JAVA_INCLUDE=/usr/lib/jvm/java-1.8.0/include 

gcc -shared -O3 -fPIC unix.c -I$JAVA_INCLUDE -I$JAVA_INCLUDE/linux -o libunix.so



# MACHINE_BYTE_ORDER=1 corresponds to 'little endian'

gcc -shared -O3 -fPIC -DMACHINE_BYTE_ORDER=1 copy*.c  -I/usr/java/jdk1.6.0/include -I/usr/java/jdk1.6.0/include/linux -o libnativedata.so
 
gcc -shared -O3 -fPIC -DMACHINE_BYTE_ORDER=1 copy*.c -I$JAVA_INCLUDE -I$JAVA_INCLUDE/linux -o libnativedata.so

source/c/compile_linux_arm.sh

+2 −2
Original line number Diff line number Diff line 
#! /bin/bash



gcc -shared -O3 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -I/usr/java/jdk1.7.0/include -I/usr/java/jdk1.7.0/include/linux unix.c -o libunix.so

gcc -shared -O3 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -I/usr/java/jdk1.8.0/include -I/usr/java/jdk1.8.0/include/linux unix.c -o libunix.so



# MACHINE_BYTE_ORDER=1 corresponds to 'little endian'

gcc -shared -O3 -fPIC -DMACHINE_BYTE_ORDER=1 copy*.c  -I/usr/java/jdk1.7.0/include -I/usr/java/jdk1.7.0/include/linux -o libnativedata.so
 
gcc -shared -O3 -fPIC -DMACHINE_BYTE_ORDER=1 copy*.c -I/usr/java/jdk1.8.0/include -I/usr/java/jdk1.8.0/include/linux -o libnativedata.so

source/c/compile_linux_i386.sh

deleted100755 → 0
+0 −6
Original line number Diff line number Diff line 
#! /bin/bash



gcc -m32 -shared -O3 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -I/usr/java/jdk1.6.0/include -I/usr/java/jdk1.6.0/include/linux unix.c -o libunix.so



# MACHINE_BYTE_ORDER=1 corresponds to 'little endian'

gcc -m32 -shared -O3 -fPIC -DMACHINE_BYTE_ORDER=1 copy*.c  -I/usr/java/jdk1.6.0/include -I/usr/java/jdk1.6.0/include/linux -o libnativedata.so

source/c/compile_macosx_i386.sh

deleted100755 → 0
+0 −6
Original line number Diff line number Diff line 
#! /bin/bash



gcc -m32 -mmacosx-version-min=10.6 -bundle -O3 unix.c -I/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers -o libunix.jnilib



# MACHINE_BYTE_ORDER=1 corresponds to 'little endian'

gcc -m32 -mmacosx-version-min=10.6 -bundle -O3 -DMACHINE_BYTE_ORDER=1 copy*.c -I/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers -o libnativedata.jnilib