Support for storyboards in GNUmakefiles.

This commit is contained in:
Gregory John Casamento 2020-09-07 00:17:25 -04:00
parent eb7c5d8df3
commit 5cdfca4345

View file

@ -223,10 +223,12 @@ MAIN_MODEL_FILE = $(strip $(subst .gmodel,,$(subst .gorm,,$(subst .nib,,$($(GNUS
MAIN_MARKUP_FILE = $(strip $(subst .gsmarkup,,$($(GNUSTEP_INSTANCE)_MAIN_MARKUP_FILE)))
MAIN_STORYBOARD_FILE = $(strip $(subst .gmodel,,$(subst .gorm,,$(subst .nib,,$($(GNUSTEP_INSTANCE)_MAIN_STORYBOARD_FILE)))))
# We must recreate Info.plist if PRINCIPAL_CLASS and/or
# APPLICATION_ICON and/or MAIN_MODEL_FILE and/or MAIN_MARKUP_FILE has
# changed since last time we built Info.plist. We use
# stamp-string.make, which will store the variables in a stamp file
# APPLICATION_ICON and/or MAIN_MODEL_FILE and/or MAIN_MARKUP_FILE and/or
# MAIN_STORBOARD_FILE has changed since last time we built Info.plist.
# We use stamp-string.make, which will store the variables in a stamp file
# inside GNUSTEP_STAMP_DIR, and rebuild Info.plist if
# GNUSTEP_STAMP_STRING changes. We will also depend on xxxInfo.plist
# if any.
@ -265,6 +267,7 @@ $(APP_INFO_PLIST_FILE): $(GNUSTEP_STAMP_DEPEND) $(GNUSTEP_PLIST_DEPEND)
$(ECHO_CREATING)(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
echo " NSExecutable = \"$(GNUSTEP_INSTANCE)\";"; \
echo " NSMainNibFile = \"$(MAIN_MODEL_FILE)\";"; \
echo " NSMainStoryboardFile = \"$(MAIN_STORYBOARD_FILE)\";"; \
echo " GSMainMarkupFile = \"$(MAIN_MARKUP_FILE)\";"; \
if [ "$(APPLICATION_ICON)" != "" ]; then \
echo " CFBundleIconFile = \"$(APPLICATION_ICON)\";"; \
@ -281,6 +284,7 @@ $(APP_INFO_PLIST_FILE): $(GNUSTEP_STAMP_DEPEND) $(GNUSTEP_PLIST_DEPEND)
$(ECHO_CREATING)(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
echo " NSExecutable = \"$(GNUSTEP_INSTANCE)\";"; \
echo " NSMainNibFile = \"$(MAIN_MODEL_FILE)\";"; \
echo " NSMainStoryboardFile = \"$(MAIN_STORYBOARD_FILE)\";"; \
echo " GSMainMarkupFile = \"$(MAIN_MARKUP_FILE)\";"; \
if [ "$(APPLICATION_ICON)" != "" ]; then \
echo " NSIcon = \"$(APPLICATION_ICON)\";"; \