mirror of
https://github.com/xerial/snappy-java.git
synced 2025-07-24 06:24:40 +02:00
Simplify scritps
This commit is contained in:
parent
023f507240
commit
c726d85a4b
15
Makefile
15
Makefile
@ -181,10 +181,10 @@ DOCKER_RUN_OPTS:=--rm
|
||||
|
||||
|
||||
win32: jni-header
|
||||
./docker/dockcross-windows-x86 -a $(DOCKER_RUN_OPTS) bash -c 'make clean-native snappy-header native CROSS_PREFIX=i686-w64-mingw32.static- OS_NAME=Windows OS_ARCH=x86 SNAPPY_CMAKE_OPTS="-DHAVE_SYS_UIO_H=0"'
|
||||
./docker/dockcross-windows-x86 -a $(DOCKER_RUN_OPTS) bash -c 'make clean-native native CROSS_PREFIX=i686-w64-mingw32.static- OS_NAME=Windows OS_ARCH=x86 SNAPPY_CMAKE_OPTS="-DHAVE_SYS_UIO_H=0"'
|
||||
|
||||
win64: jni-header
|
||||
./docker/dockcross-windows-x64 -a $(DOCKER_RUN_OPTS) bash -c 'make clean-native snappy-header native CROSS_PREFIX=x86_64-w64-mingw32.static- OS_NAME=Windows OS_ARCH=x86_64 SNAPPY_CMAKE_OPTS="-DHAVE_SYS_UIO_H=0"'
|
||||
./docker/dockcross-windows-x64 -a $(DOCKER_RUN_OPTS) bash -c 'make clean-native native CROSS_PREFIX=x86_64-w64-mingw32.static- OS_NAME=Windows OS_ARCH=x86_64 SNAPPY_CMAKE_OPTS="-DHAVE_SYS_UIO_H=0"'
|
||||
|
||||
# deprecated
|
||||
mac32: jni-header
|
||||
@ -203,18 +203,13 @@ freebsd64:
|
||||
$(MAKE) native OS_NAME=FreeBSD OS_ARCH=x86_64
|
||||
|
||||
# For ARM
|
||||
<<<<<<< HEAD
|
||||
native-arm: linux-arm64 linux-android-arm linux-android-aarch64 linux-arm linux-armv6 linux-armv7
|
||||
=======
|
||||
native-arm: win-armv7 win-aarch64 linux-arm64 linux-android-arm linux-arm linux-armv6 linux-armv7
|
||||
native-arm: win-armv7 win-aarch64 linux-arm64 linux-android-arm linux-android-aarch64 linux-arm linux-armv6 linux-armv7
|
||||
|
||||
win-armv7: jni-header
|
||||
./docker/dockcross-windows-armv7 -a $(DOCKER_RUN_OPTS) bash -c 'make clean-native snappy-header native CROSS_PREFIX=armv7-w64-mingw32- OS_NAME=Windows OS_ARCH=armv7 SNAPPY_CMAKE_OPTS="-DHAVE_SYS_UIO_H=0"'
|
||||
./docker/dockcross-windows-armv7 -a $(DOCKER_RUN_OPTS) bash -c 'make clean-native native OS_NAME=Windows OS_ARCH=armv7'
|
||||
|
||||
win-aarch64: jni-header
|
||||
./docker/dockcross-windows-arm64 -a $(DOCKER_RUN_OPTS) bash -c 'make clean-native snappy-header native CROSS_PREFIX=aarch64-w64-mingw32- OS_NAME=Windows OS_ARCH=aarch64 SNAPPY_CMAKE_OPTS="-DHAVE_SYS_UIO_H=0"'
|
||||
>>>>>>> 5426196 (Fix script)
|
||||
|
||||
./docker/dockcross-windows-arm64 -a $(DOCKER_RUN_OPTS) bash -c 'make clean-native native OS_NAME=Windows OS_ARCH=aarch64'
|
||||
|
||||
# TODO: CROSS_PREFIX can be replaced with ${CROSS_ROOT}/bin/${CROSS_TRIPLE}- in Makefile.common
|
||||
linux-arm: jni-header
|
||||
|
@ -295,15 +295,15 @@ Windows-x86_64_LINKFLAGS := -Wl,--kill-at -shared -static
|
||||
Windows-x86_64_LIBNAME := snappyjava.dll
|
||||
Windows-x86_64_SNAPPY_FLAGS :=
|
||||
|
||||
Windows-armv7_CXX := $(CROSS_PREFIX)g++
|
||||
Windows-armv7_STRIP := $(CROSS_PREFIX)strip
|
||||
Windows-armv7_CXX := ${CROSS_ROOT}/bin/${CROSS_TRIPLE}-g++
|
||||
Windows-armv7_STRIP := ${CROSS_ROOT}/bin/${CROSS_TRIPLE}-strip
|
||||
Windows-armv7_CXXFLAGS := -Ilib/inc_win -O2 -std=c++11
|
||||
Windows-armv7_LINKFLAGS := -Wl,--kill-at -shared -static
|
||||
Windows-armv7_LIBNAME := snappyjava.dll
|
||||
Windows-armv7_SNAPPY_FLAGS :=
|
||||
|
||||
Windows-aarch64_CXX := $(CROSS_PREFIX)g++
|
||||
Windows-aarch64_STRIP := $(CROSS_PREFIX)strip
|
||||
Windows-aarch64_CXX := ${CROSS_ROOT}/bin/${CROSS_TRIPLE}-g++
|
||||
Windows-aarch64_STRIP := ${CROSS_ROOT}/bin/${CROSS_TRIPLE}-strip
|
||||
Windows-aarch64_CXXFLAGS := -Ilib/inc_win -O2 -std=c++11
|
||||
Windows-aarch64_LINKFLAGS := -Wl,--kill-at -shared -static
|
||||
Windows-aarch64_LIBNAME := snappyjava.dll
|
||||
|
Loading…
x
Reference in New Issue
Block a user