Commits

Grace Batumbya committed 8bfd83c Merge

Merge with Linux and Mac OS X builds.

Comments (0)

Files changed (5)

 
 Mac-x86_64_CC        := gcc -arch $(OS_ARCH) 
 Mac-x86_64_STRIP     := strip -x
-Mac-x86_64_CFLAGS    := -I/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/JavaVM.framework/Headers -O2 -fPIC -mmacosx-version-min=10.5 -fvisibility=hidden
+MAC_SDK := /Developer/SDKs/MacOSX10.7.sdk
+ifeq ($(wildcard MAC_SDK),)
+	MAC_SDK := /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk
+endif
+Mac-x86_64_CFLAGS    := -I$(MAC_SDK)/System/Library/Frameworks/JavaVM.framework/Headers -O2 -fPIC -mmacosx-version-min=10.5 -fvisibility=hidden
 Mac-x86_64_LINKFLAGS := -dynamiclib -static-libgcc
 Mac-x86_64_LIBNAME   := libsqlitejdbc.jnilib
 Mac-x86_64_SQLITE_FLAGS  := 
Add a comment to this file

src/main/resources/org/sqlite/native/Linux/amd64/libsqlitejdbc.so

Binary file modified.

Add a comment to this file

src/main/resources/org/sqlite/native/Linux/i386/libsqlitejdbc.so

Binary file modified.

Add a comment to this file

src/main/resources/org/sqlite/native/Mac/i386/libsqlitejdbc.jnilib

Binary file modified.

Add a comment to this file

src/main/resources/org/sqlite/native/Mac/x86_64/libsqlitejdbc.jnilib

Binary file modified.

Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.