couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject [12/15] snappy commit: updated refs/heads/import-master to 64cd135
Date Wed, 12 Feb 2014 06:23:22 GMT
Fix COUCHDB-1197 - NIFs, .dll fixes for Windows

Many thanks, Dave Cottlehuber.

git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1147001 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/couchdb-snappy/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-snappy/commit/dfa46ca3
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-snappy/tree/dfa46ca3
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-snappy/diff/dfa46ca3

Branch: refs/heads/import-master
Commit: dfa46ca3362d2408e07b7825ccb542f3d458a2fc
Parents: 32ed37d
Author: Randall Leeds <randall@apache.org>
Authored: Fri Jul 15 07:54:36 2011 +0000
Committer: Randall Leeds <randall@apache.org>
Committed: Fri Jul 15 07:54:36 2011 +0000

----------------------------------------------------------------------
 Makefile.am | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-snappy/blob/dfa46ca3/Makefile.am
----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index 5e9024d..55046ba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,13 +54,17 @@ snappy_nif_la_LDFLAGS = -module -avoid-version
 
 if WINDOWS
 snappy_nif_la_LDFLAGS += -no-undefined
+snappy_nif_la_CXXFLAGS += -EHsc
+SNAPPY_SO_NAME = snappy_nif.dll
+else
+SNAPPY_SO_NAME = snappy_nif.so
 endif
 
-priv/snappy_nif.so: snappy_nif.la
+priv/$(SNAPPY_SO_NAME): snappy_nif.la
 	@mkdir -p ./priv
-	cp .libs/snappy_nif.so $@
+	cp .libs/$(SNAPPY_SO_NAME) $@
 
-all: priv/snappy_nif.so
+all: priv/$(SNAPPY_SO_NAME)
 endif
 
 %.app: %.app.in


Mime
View raw message