[Vm-dev] [commit][3581] Mac OS X gnu makefiles:
commits at squeakvm.org
commits at squeakvm.org
Thu Feb 11 00:23:42 UTC 2016
Revision: 3581
Author: eliot
Date: 2016-02-10 16:23:41 -0800 (Wed, 10 Feb 2016)
Log Message:
-----------
Mac OS X gnu makefiles:
Complete the app bundle build by compiling in the MainMenu.nib.
Modified Paths:
--------------
branches/Cog/build.macos32x86/common/Makefile.app
branches/Cog/build.macos32x86/common/Makefile.flags
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/build.macos32x86/common/Makefile.app
===================================================================
--- branches/Cog/build.macos32x86/common/Makefile.app 2016-02-10 21:00:41 UTC (rev 3580)
+++ branches/Cog/build.macos32x86/common/Makefile.app 2016-02-11 00:23:41 UTC (rev 3581)
@@ -48,8 +48,9 @@
VMBUNDLES:=$(addprefix $(APP)/Contents/Resources/, $(addsuffix .bundle, $(EXTERNAL_PLUGINS)))
OSXICONS:=$(OSXDIR)/$(VM).icns $(wildcard $(OSXDIR)/$(SYSTEM)*.icns)
VMICONS:=$(addprefix $(APP)/Contents/Resources/,$(notdir $(OSXICONS)))
+VMMENUNIB:=$(APP)/Contents/Resources/English.lproj/MainMenu.nib
-$(APP): $(VMEXE) $(VMBUNDLES) $(VMPLIST) $(VMICONS)
+$(APP): $(VMEXE) $(VMBUNDLES) $(VMPLIST) $(VMMENUNIB) $(VMICONS)
$(VMEXE): vm $(OBJDIR)/$(VM)
mkdir -p $(APP)/Contents/MacOS
@@ -66,6 +67,14 @@
sed "s/\$$(VERSION_TAG)/`getversion VERSION_TAG`/" | \
sed "s/\$$(VM_NICKNAME)/`getversion VM_NICKNAME`/" > $@
+$(VMMENUNIB): $(PLATDIR)/iOS/vm/English.lproj/MainMenu.xib
+ mkdir -p $(dir $@)
+ $(XCUB)/ibtool --errors --warnings --notices --module $(VM) \
+ --minimum-deployment-target $(TARGET_VERSION_MIN) \
+ --auto-activate-custom-fonts --output-format human-readable-text \
+ --compile $(VMMENUNIB) \
+ $(PLATDIR)/iOS/vm/English.lproj/MainMenu.xib
+
$(APP)/Contents/Resources/%.icns: $(OSXDIR)/%.icns
mkdir -p $(APP)/Contents/Resources
cp -p $< $(APP)/Contents/Resources
Modified: branches/Cog/build.macos32x86/common/Makefile.flags
===================================================================
--- branches/Cog/build.macos32x86/common/Makefile.flags 2016-02-10 21:00:41 UTC (rev 3580)
+++ branches/Cog/build.macos32x86/common/Makefile.flags 2016-02-11 00:23:41 UTC (rev 3581)
@@ -1,14 +1,18 @@
#############################################################################
-# Compilations flags for Mac OS X
+# Compilations flags & paths for Mac OS X
#
# These are derived from Xcode v 6.2 for Apple LLVM version 6.0 (clang-600.0.57)
-SDK:=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk
+XCODE:=/Applications/Xcode.app/Contents/Developer
+XCUB:=$(XCODE)/usr/bin
+SDK:=$(XCODE)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk
TARGET_ARCH:=i386
+TARGET_VERSION_MIN:=10.6
CFLAGS:=$(CFLAGS) -DBUILD_FOR_OSX \
-arch $(TARGET_ARCH) \
- -mmacosx-version-min=10.6 -msse4.2 -fvisibility=hidden -fwrapv \
+ -mmacosx-version-min=$(TARGET_VERSION_MIN) -msse4.2 \
+ -fvisibility=hidden -fwrapv \
-fmacro-backtrace-limit=0 -fdiagnostics-show-note-include-stack \
-fmessage-length=0 -fpascal-strings -fasm-blocks -fstrict-aliasing \
-isysroot $(SDK) \
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Wed Feb 10 12:49:01 PST 2016
+ Wed Feb 10 16:22:12 PST 2016
More information about the Vm-dev
mailing list