diff options
author | Tor Lillqvist <tml@iki.fi> | 2013-03-01 10:55:34 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2013-03-01 10:55:51 +0200 |
commit | 18e035964e92cb4348a4de0bafc4114608ed4754 (patch) | |
tree | 297d0af5e517f1c41f04b83e3d8d96fb41a6f7f5 /ios | |
parent | 6a1cb54c31a0e7591173afa167938535bbe5cf6e (diff) |
Cleanups to the android and ios makefilery
Also build the "desktop" app from gbuild.
Change-Id: I45fc265c9515b22e10bd7644f54dbfa23601e063
Diffstat (limited to 'ios')
-rw-r--r-- | ios/CustomTarget_Viewer_app.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ios/CustomTarget_Viewer_app.mk b/ios/CustomTarget_Viewer_app.mk index c92092bd0e6c..d2ccf34e82a2 100644 --- a/ios/CustomTarget_Viewer_app.mk +++ b/ios/CustomTarget_Viewer_app.mk @@ -56,7 +56,7 @@ appdir=$(dir $(SCRIPT_OUTPUT_FILE_0)) buildid=$(shell git log -1 --format=%H) $(SCRIPT_OUTPUT_FILE_0) : $(call gb_Executable_get_target,Viewer) - $(call gb_Output_announce,$@,fii,APP,2) + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),APP,2) mkdir -p $(appdir)/ure mv $(call gb_Executable_get_target,Viewer) $(SCRIPT_OUTPUT_FILE_0) # @@ -138,6 +138,7 @@ $(call gb_CustomTarget_get_target,ios/Viewer_app) : $(call gb_Executable_get_tar $(call gb_Postprocess_get_target,AllModulesButInstsetNative) $(call gb_CustomTarget_get_clean_target,ios/Viewer_app) : + $(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),APP,2) # Here we just assume that Xcode's settings are default, or something rm -rf experimental/Viewer/build |