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

[DEV] better management of the Mac binary generation an Other

Browse Source
This commit is contained in:
Edouard DUPIN 2013-04-08 21:20:26 +02:00
parent fa06553c5e
commit 77caff070b
3 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.mk
View File

@ -9,6 +9,9 @@
## General setup.
###############################################################################
# show for windows : http://benjamin.smedbergs.us/pymake/
# Make sure SHELL is correctly set
SHELL := /bin/bash

7
core/defs.mk
View File

@ -702,8 +702,7 @@ endif
###############################################################################
## Commands for running gcc to link an executable.
###############################################################################
ifneq ("$(TARGET_OS)","MacOs")
define transform-o-to-executable
define transform-o-to-executable-mac
@mkdir -p $(dir $@)
@echo "Executable (mac): $(PRIVATE_MODULE) ==> $(call path-from-top,$@)"
$(call check-pwd-is-top-dir)
@ -719,7 +718,7 @@ $(Q)$(TARGET_CXX) \
$(TARGET_GLOBAL_LDLIBS)
$(call strip-executable)
endef
else
define transform-o-to-executable
@mkdir -p $(dir $@)
@echo "Executable: $(PRIVATE_MODULE) ==> $(call path-from-top,$@)"
@ -742,7 +741,7 @@ $(Q)$(TARGET_CXX) \
$(TARGET_GLOBAL_LDLIBS)
$(call strip-executable)
endef
endif
###############################################################################
## Commands for copying files.
###############################################################################

23
core/module.mk
View File

@ -97,10 +97,13 @@ endif
ifeq ("$(LOCAL_MODULE_CLASS)","EXECUTABLE")
include $(BUILD_RULES)
ifeq ("$(TARGET_OS)","MacOs")
$(LOCAL_BUILD_MODULE): $(all_objects) $(all_libraries)
$(transform-o-to-executable-mac)
else
$(LOCAL_BUILD_MODULE): $(all_objects) $(all_libraries)
$(transform-o-to-executable)
endif
copy_to_staging := 1
endif
@ -117,6 +120,22 @@ $(LOCAL_BUILD_MODULE):
endif
###############################################################################
## Package Generation.
###############################################################################
ifeq ("$(LOCAL_MODULE_CLASS)","PACKAGE")
include $(BUILD_RULES)
$(LOCAL_BUILD_MODULE)-pkg: $(LOCAL_BUILD_MODULE)
$(transform-staging-to-package)
copy_to_staging := 1
endif
###############################################################################
## Files to copy.
###############################################################################