diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-07-26 00:02:36 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2011-07-26 00:02:36 +0300 |
| commit | bb2bc3e03a7ec373b20f79bf51ea041e42a92810 (patch) | |
| tree | 5baab44e47ce6c124f57b962bd7f821926495f82 /solenv/gbuild | |
| parent | 40bebbb7de7237b5dce1185b57b5039436a1c5f9 (diff) | |
Adapt to current gbuild conventions
Diffstat (limited to 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/platform/ios.mk | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk index 61b2086db873..c2b8d31de5b8 100644 --- a/solenv/gbuild/platform/ios.mk +++ b/solenv/gbuild/platform/ios.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -138,14 +139,14 @@ endef define gb_CObject__command $(call gb_Output_announce,$(2),$(true),C ,3) $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ - mkdir -p $(dir $(call gb_CObject_get_dep_target,$(2))) && \ + mkdir -p $(dir $(1)) $(dir $(4)) && \ $(gb_CC) \ - $(DEFS) $(CFLAGS) \ + $(DEFS) \ + $(T_CFLAGS) \ -c $(3) \ -o $(1) \ - -MMD -MT $(call gb_CObject_get_target,$(2)) \ - -MF $(call gb_CObject_get_dep_target,$(2)) \ + -MMD -MT $(1) \ + -MF $(4) \ -I$(dir $(3)) \ $(INCLUDE)) endef @@ -153,18 +154,18 @@ endef # CxxObject class -# N.B: $(CXXFLAGS) may contain -x objective-c++, which must come before -c +# N.B: $(T_CXXFLAGS) may contain -x objective-c++, which must come before -c define gb_CxxObject__command $(call gb_Output_announce,$(2),$(true),CXX,3) $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ - mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \ + mkdir -p $(dir $(1)) $(dir $(4)) && \ $(gb_CXX) \ - $(DEFS) $(CXXFLAGS) \ + $(DEFS) \ + $(T_CXXFLAGS) \ -c $(3) \ -o $(1) \ - -MMD -MT $(call gb_CxxObject_get_target,$(2)) \ - -MF $(call gb_CxxObject_get_dep_target,$(2)) \ + -MMD -MT $(1) \ + -MF $(4) \ -I$(dir $(3)) \ $(INCLUDE_STL) $(INCLUDE)) endef @@ -175,14 +176,14 @@ endef define gb_ObjCxxObject__command $(call gb_Output_announce,$(2),$(true),OCX,3) $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ - mkdir -p $(dir $(call gb_ObjCxxObject_get_dep_target,$(2))) && \ + mkdir -p $(dir $(1)) $(dir $(4)) && \ $(gb_CXX) \ - $(DEFS) $(OBJCXXFLAGS) \ + $(DEFS) \ + $(T_OBJCXXFLAGS) \ -c $(3) \ -o $(1) \ - -MMD -MT $(call gb_ObjCxxObject_get_target,$(2)) \ - -MF $(call gb_ObjCxxObject_get_dep_target,$(2)) \ + -MMD -MT $(1) \ + -MF $(4) \ -I$(dir $(3)) \ $(INCLUDE_STL) $(INCLUDE)) endef |