Skip to content

Commit

Permalink
Build win librariles with docker cross compiler image
Browse files Browse the repository at this point in the history
  • Loading branch information
xerial committed Sep 23, 2016
1 parent 0230efd commit 3ff6755
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,12 @@ $(NATIVE_DLL): $(SQLITE_OUT)/$(LIBNAME)
cp $< $(NATIVE_TARGET_DIR)/$(LIBNAME)

# for cross-compilation on Ubuntu, install the g++-mingw-w64-i686 package
win32:
$(MAKE) native CROSS_PREFIX=i686-w64-mingw32- OS_NAME=Windows OS_ARCH=x86
win32: $(SQLITE_UNPACKED) jni-header
./docker/dockcross-windows-x86 bash -c 'make native CROSS_PREFIX=i686-w64-mingw32.static- OS_NAME=Windows OS_ARCH=x86'

# for cross-compilation on Ubuntu, install the g++-mingw-w64-x86-64 package
win64:
$(MAKE) native CROSS_PREFIX=x86_64-w64-mingw32- OS_NAME=Windows OS_ARCH=x86_64
win64: $(SQLITE_UNPACKED) jni-header
./docker/dockcross-windows-x64 bash -c 'make native CROSS_PREFIX=x86_64-w64-mingw32.static- OS_NAME=Windows OS_ARCH=x86_64'

linux32:
$(MAKE) native OS_NAME=Linux OS_ARCH=x86
Expand Down
8 changes: 4 additions & 4 deletions Makefile.common
Original file line number Diff line number Diff line change
Expand Up @@ -129,15 +129,15 @@ Mac-x86_64_LINKFLAGS := -dynamiclib
Mac-x86_64_LIBNAME := libsqlitejdbc.jnilib
Mac-x86_64_SQLITE_FLAGS :=

Windows-x86_CC := i686-w64-mingw32-gcc
Windows-x86_STRIP := i686-w64-mingw32-strip
Windows-x86_CC := $(CROSS_PREFIX)gcc
Windows-x86_STRIP := $(CROSS_PREFIX)strip
Windows-x86_CCFLAGS := -D_JNI_IMPLEMENTATION_ -Ilib/inc_win -O2
Windows-x86_LINKFLAGS := -Wl,--kill-at -shared -static-libgcc
Windows-x86_LIBNAME := sqlitejdbc.dll
Windows-x86_SQLITE_FLAGS :=

Windows-x86_64_CC := x86_64-w64-mingw32-gcc
Windows-x86_64_STRIP := x86_64-w64-mingw32-strip
Windows-x86_64_CC := $(CROSS_PREFIX)gcc
Windows-x86_64_STRIP := $(CROSS_PREFIX)strip
Windows-x86_64_CCFLAGS := -D_JNI_IMPLEMENTATION_ -Ilib/inc_win -O2
Windows-x86_64_LINKFLAGS := -Wl,--kill-at -shared -static-libgcc
Windows-x86_64_LIBNAME := sqlitejdbc.dll
Expand Down
Binary file modified src/main/resources/org/sqlite/native/Windows/x86/sqlitejdbc.dll
Binary file not shown.
Binary file not shown.

0 comments on commit 3ff6755

Please sign in to comment.