atria-tools/lutin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add ranlib when generating the .a to the windows compialation

Browse Source
This commit is contained in:
Edouard Dupin 2012-08-15 20:35:50 +02:00
parent 2fb3842dd0
commit dd60045670
3 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/defs.mk
View File

@ -408,6 +408,7 @@ define transform-o-to-static-lib
$(call check-pwd-is-top-dir) $(call check-pwd-is-top-dir)
@rm -f $@ @rm -f $@
$(Q)$(AR) $(TARGET_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@ $(PRIVATE_ALL_OBJECTS) $(Q)$(AR) $(TARGET_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@ $(PRIVATE_ALL_OBJECTS)
$(Q)$(RANLIB) $@
endef endef
############################################################################### ###############################################################################

27
core/main.mk
View File

@ -44,8 +44,12 @@ else
endif endif
AR ?= $(CROSS)ar AR ?= $(CROSS)ar
LD ?= $(CROSS)ld LD ?= $(CROSS)ld
AS ?= $(CROSS)as
NM ?= $(CROSS)nm NM ?= $(CROSS)nm
STRIP ?= $(CROSS)strip STRIP ?= $(CROSS)strip
RANLIB ?= $(CROSS)ranlib
DLLTOOL ?= $(CROSS)dlltool
OBJDUMP ?= $(CROSS)objdump
# This is the default target. It must be the first declared target. # This is the default target. It must be the first declared target.
all: all:
@ -130,8 +134,27 @@ ifeq ("$(V)","1")
$(info list packet=$(shell find $(USER_PACKAGES) -name $(TARGET_OS).mk)) $(info list packet=$(shell find $(USER_PACKAGES) -name $(TARGET_OS).mk))
endif endif
# Get the list of all makefiles available and include them # Get the list of all makefiles available and include them this find the TARGET_OS.mk and the Generic.mk
makefiles += $(shell find $(USER_PACKAGES) -name $(TARGET_OS).mk) _moduleFolder = $(shell find $(USER_PACKAGES) -name $(TARGET_OS).mk)
_moduleFolder += $(shell find $(USER_PACKAGES) -name Generic.mk)
# only keep one folder for each makefile found.
_tmpDirectory = $(sort $(dir $(_moduleFolder)))
# this section have all the makefile possible for a specific target,
# this isolate the good makefile for every folder where a makefile present
# for each folder
# check if TARGET_OS.mk is present
# add it
# otherwise
# add generic makefile
$(foreach __makefile,$(_tmpDirectory), \
$(if $(wildcard $(__makefile)$(TARGET_OS).mk), \
$(eval makefiles += $(__makefile)$(TARGET_OS).mk) , \
$(eval makefiles += $(__makefile)Generic.mk) \
) \
)
# import all the makefiles
$(info makefiles="$(makefiles)")
include $(makefiles) include $(makefiles)

2
core/setup.mk
View File

@ -54,8 +54,6 @@ ifeq ("$(TARGET_OS)","Windows")
TARGET_GLOBAL_LDFLAGS += -Wl,-Bstatic TARGET_GLOBAL_LDFLAGS += -Wl,-Bstatic
endif endif
i586-mingw32msvc-
else ifeq ("$(TARGET_OS)","Android") else ifeq ("$(TARGET_OS)","Android")
TARGET_GLOBAL_CFLAGS += -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ \ TARGET_GLOBAL_CFLAGS += -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ \
-fpic -ffunction-sections -funwind-tables -fstack-protector \ -fpic -ffunction-sections -funwind-tables -fstack-protector \