Ecere Software
/
sdk
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Makefiles: Force building 32 or 64 bit by setting ARCH=32 or 64
[sdk]
/
eda
/
drivers
/
sqliteCipher
/
Makefile
diff --git
a/eda/drivers/sqliteCipher/Makefile
b/eda/drivers/sqliteCipher/Makefile
index
7109d1b
..
7005ece
100644
(file)
--- a/
eda/drivers/sqliteCipher/Makefile
+++ b/
eda/drivers/sqliteCipher/Makefile
@@
-42,7
+42,7
@@
OBJ = obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/
RES =
ifdef LINUX_TARGET
RES =
ifdef LINUX_TARGET
-TARGET = obj/$(CONFIG).$(PLATFORM)/$(LP)EDASQLiteCipher$(SO).0.44
+TARGET = obj/$(CONFIG).$(PLATFORM)
$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)
/$(LP)EDASQLiteCipher$(SO).0.44
SONAME = -Wl,-soname,$(LP)EDASQLiteCipher$(SO).0
else
TARGET = obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EDASQLiteCipher$(SO)
SONAME = -Wl,-soname,$(LP)EDASQLiteCipher$(SO).0
else
TARGET = obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EDASQLiteCipher$(SO)
@@
-89,14
+89,14
@@
PRJ_CFLAGS += \
$(if $(WINDOWS_TARGET), \
-I$(OPENSSL_INCLUDE_DIR) \
-I../../../deps/libffi-3.0.11/i686-pc-mingw32/include,) \
$(if $(WINDOWS_TARGET), \
-I$(OPENSSL_INCLUDE_DIR) \
-I../../../deps/libffi-3.0.11/i686-pc-mingw32/include,) \
- $(if $(DEBUG), -g, -O2 -ffast-math) $(F
ORCE_32_BIT) $(F
PIC) -w \
+ $(if $(DEBUG), -g, -O2 -ffast-math) $(FPIC) -w \
-DSQLITE_HAS_CODEC
CUSTOM1_PRJ_CFLAGS = \
$(if $(WINDOWS_TARGET), \
-I$(OPENSSL_INCLUDE_DIR) \
-I../../../deps/libffi-3.0.11/i686-pc-mingw32/include,) \
-DSQLITE_HAS_CODEC
CUSTOM1_PRJ_CFLAGS = \
$(if $(WINDOWS_TARGET), \
-I$(OPENSSL_INCLUDE_DIR) \
-I../../../deps/libffi-3.0.11/i686-pc-mingw32/include,) \
- $(if $(DEBUG), -g, -O2) $(F
ORCE_32_BIT) $(F
PIC) -w \
+ $(if $(DEBUG), -g, -O2) $(FPIC) -w \
-DSQLITE_HAS_CODEC
-DSQLITE_HAS_CODEC
@@
-148,12
+148,10
@@
endif
CECFLAGS += -cpp $(_CPP)
CECFLAGS += -cpp $(_CPP)
-OFLAGS += $(FORCE_32_BIT)
-
ifndef STATIC_LIBRARY_TARGET
OFLAGS += \
ifndef STATIC_LIBRARY_TARGET
OFLAGS += \
- -L../../../obj/$(PLATFORM)/bin \
- -L../../../obj/$(PLATFORM)/lib
+ -L../../../obj/$(PLATFORM)
$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)
/bin \
+ -L../../../obj/$(PLATFORM)
$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)
/lib
endif
# TARGETS
endif
# TARGETS
@@
-164,7
+162,7
@@
objdir:
$(if $(wildcard $(OBJ)),,$(call mkdirq,$(OBJ)))
$(OBJ)$(MODULE).main.ec: $(SYMBOLS) $(COBJECTS)
$(if $(wildcard $(OBJ)),,$(call mkdirq,$(OBJ)))
$(OBJ)$(MODULE).main.ec: $(SYMBOLS) $(COBJECTS)
- $(ECS) $(
FORCE_32_BIT
) $(ECSLIBOPT) $(SYMBOLS) $(IMPORTS) -symbols obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX) -o $(OBJ)$(MODULE).main.ec
+ $(ECS) $(
ARCH_FLAGS
) $(ECSLIBOPT) $(SYMBOLS) $(IMPORTS) -symbols obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX) -o $(OBJ)$(MODULE).main.ec
$(OBJ)$(MODULE).main.c: $(OBJ)$(MODULE).main.ec
$(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(OBJ)$(MODULE).main.ec -o $(OBJ)$(MODULE).main.sym -symbols $(OBJ)
$(OBJ)$(MODULE).main.c: $(OBJ)$(MODULE).main.ec
$(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(OBJ)$(MODULE).main.ec -o $(OBJ)$(MODULE).main.sym -symbols $(OBJ)