minors on macosx
authoradam <adamansky@gmail.com>
Fri, 9 Nov 2012 13:07:08 +0000 (15:07 +0200)
committeradam <adamansky@gmail.com>
Fri, 9 Nov 2012 13:07:08 +0000 (15:07 +0200)
binding.gyp
package.json
tcejdb/Makefile.in

index fef6eb3..bfe1ba7 100644 (file)
@@ -34,7 +34,6 @@
             }],
            [ 'OS=="mac"', {
                'defines': ['_DARWIN_USE_64_BIT_INODE=1'],
-               'cflags': [ '-Wall', '-pedantic'],      
                'cflags_cc!' : [ '-fno-exceptions' ],
                'xcode_settings': {     
                        'GCC_ENABLE_CPP_EXCEPTIONS':'YES',
@@ -44,7 +43,7 @@
                        'OTHER_LDFLAGS': [
                                '-Wl,-search_paths_first',
                                '-L./tcejdb/static',                            
-                               '-ltcejdb -lz -lpthread -lm -lc'
+                               '-lstcejdb -lz -lpthread -lm -lc'
                        ]                                               
                }
             }]        
@@ -61,4 +60,4 @@
             ]
         },
     ]
-}
\ No newline at end of file
+}
index 08e52cf..0c15a20 100644 (file)
@@ -1,6 +1,6 @@
 {
     "name" : "ejdb",
-    "version" : "1.0.3",
+    "version" : "1.0.4",
     "main" : "node/ejdb.js",
     "description" : "EJDB - Embedded JSON Database engine",
     "homepage" : "https://github.com/Softmotions/ejdb",
index 4d2bc23..e9b6f64 100644 (file)
@@ -684,7 +684,7 @@ wordtable :
 libtcejdb.a : $(LIBOBJFILES)
        $(AR) $(ARFLAGS) $@ $(LIBOBJFILES)
        mkdir -p ./static
-       cp ./libtcejdb.a ./static
+       cp ./libtcejdb.a ./static/libstcejdb.a
 
 
 libtcejdb.so.$(LIBVER).$(LIBREV).0 : $(LIBOBJFILES)