Permalink
Browse files

eda/drivers;sqlite,sqliteCipher; updated cipher's Makefile with libff…

…i stuff and removed double -lecere for both sqlite drivers.
  • Loading branch information...
redj authored and jerstlouis committed Jul 29, 2012
1 parent ad7cd9b commit 00f738fc0b9c9e1949329787297ba647d3ea8b21
Showing with 10 additions and 2 deletions.
  1. +1 −1 eda/drivers/sqlite/Makefile
  2. +9 −1 eda/drivers/sqliteCipher/Makefile
@@ -66,7 +66,7 @@ OFLAGS = -m32 \
-L../../../obj/$(PLATFORM)/bin \
-L../../../obj/$(PLATFORM)/lib
-LIBS = -lecere $(SHAREDLIB) $(EXECUTABLE) $(LINKOPT)
+LIBS = $(SHAREDLIB) $(EXECUTABLE) $(LINKOPT)
UPXFLAGS = -9 -q
@@ -71,7 +71,7 @@ OFLAGS = -m32 \
-L../../../obj/$(PLATFORM)/bin \
-L../../../obj/$(PLATFORM)/lib
-LIBS = -lecere $(SHAREDLIB) $(EXECUTABLE) $(LINKOPT)
+LIBS = $(SHAREDLIB) $(EXECUTABLE) $(LINKOPT)
UPXFLAGS = -9 -q
@@ -80,15 +80,23 @@ ifdef LINUX
OFLAGS += -Wl,--no-undefined
endif
+ifneq "$(TARGET_TYPE)" "staticlib"
+LIBS += -lecere -lffi
+endif
+
# PLATFORM-SPECIFIC OPTIONS
ifdef WINDOWS
CFLAGS += \
+ -I../../../deps/libffi-3.0.11/i686-pc-mingw32/include \
-I$(OPENSSL_INCLUDE_DIR)
+ifneq "$(TARGET_TYPE)" "staticlib"
OFLAGS += \
+ -L../../../deps/libffi-3.0.11/i686-pc-mingw32/.libs \
-L$(OPENSSL_BIN_DIR)
+endif
LIBS += -llibeay32

0 comments on commit 00f738f

Please sign in to comment.