[Vm-dev] [commit][3532] Normalise the build.macos*squeak.cog.spur/
Bochs plugins and get the
commits at squeakvm.org
commits at squeakvm.org
Mon Dec 14 19:30:06 UTC 2015
Revision: 3532
Author: eliot
Date: 2015-12-14 11:30:06 -0800 (Mon, 14 Dec 2015)
Log Message:
-----------
Normalise the build.macos*squeak.cog.spur/Bochs plugins and get the
64-bit ones to compile and link.
Modified Paths:
--------------
branches/Cog/build.macos32x86/squeak.cog.spur/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj
branches/Cog/build.macos32x86/squeak.cog.spur/BochsX64Plugin/BochsX64Plugin.xcodeproj/project.pbxproj
branches/Cog/build.macos64x64/squeak.cog.spur/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj
Modified: branches/Cog/build.macos32x86/squeak.cog.spur/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.spur/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj 2015-12-14 19:15:31 UTC (rev 3531)
+++ branches/Cog/build.macos32x86/squeak.cog.spur/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj 2015-12-14 19:30:06 UTC (rev 3532)
@@ -195,7 +195,7 @@
4FADC23508B4156C00ABE55E /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = i386;
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
INFOPLIST_FILE = Info.plist;
@@ -218,7 +218,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = i386;
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
CONFIGURATION_TEMP_DIR = "$(PROJECT_TEMP_DIR)/$(CONFIGURATION)";
COPY_PHASE_STRIP = NO;
@@ -233,7 +233,6 @@
STRIP_INSTALLED_PRODUCT = NO;
USER_HEADER_SEARCH_PATHS = "";
USE_HEADERMAP = NO;
- VALID_ARCHS = i386;
};
name = Debug;
};
@@ -241,7 +240,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
- ARCHS = i386;
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
CONFIGURATION_TEMP_DIR = "$(PROJECT_TEMP_DIR)/$(CONFIGURATION)";
COPY_PHASE_STRIP = NO;
@@ -254,7 +253,6 @@
SDKROOT = macosx;
USER_HEADER_SEARCH_PATHS = "";
USE_HEADERMAP = NO;
- VALID_ARCHS = i386;
};
name = Release;
};
Modified: branches/Cog/build.macos32x86/squeak.cog.spur/BochsX64Plugin/BochsX64Plugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.spur/BochsX64Plugin/BochsX64Plugin.xcodeproj/project.pbxproj 2015-12-14 19:15:31 UTC (rev 3531)
+++ branches/Cog/build.macos32x86/squeak.cog.spur/BochsX64Plugin/BochsX64Plugin.xcodeproj/project.pbxproj 2015-12-14 19:30:06 UTC (rev 3532)
@@ -195,7 +195,7 @@
4FADC23508B4156C00ABE55E /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = i386;
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
INFOPLIST_FILE = Info.plist;
@@ -218,7 +218,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = i386;
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
CONFIGURATION_TEMP_DIR = "$(PROJECT_TEMP_DIR)/$(CONFIGURATION)";
COPY_PHASE_STRIP = NO;
@@ -233,7 +233,6 @@
STRIP_INSTALLED_PRODUCT = NO;
USER_HEADER_SEARCH_PATHS = "";
USE_HEADERMAP = NO;
- VALID_ARCHS = i386;
};
name = Debug;
};
@@ -241,7 +240,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
- ARCHS = i386;
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
CONFIGURATION_TEMP_DIR = "$(PROJECT_TEMP_DIR)/$(CONFIGURATION)";
COPY_PHASE_STRIP = NO;
@@ -254,7 +253,6 @@
SDKROOT = macosx;
USER_HEADER_SEARCH_PATHS = "";
USE_HEADERMAP = NO;
- VALID_ARCHS = i386;
};
name = Release;
};
Modified: branches/Cog/build.macos64x64/squeak.cog.spur/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos64x64/squeak.cog.spur/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj 2015-12-14 19:15:31 UTC (rev 3531)
+++ branches/Cog/build.macos64x64/squeak.cog.spur/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj 2015-12-14 19:30:06 UTC (rev 3532)
@@ -3,14 +3,14 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 42;
+ objectVersion = 46;
objects = {
/* Begin PBXBuildFile section */
73020E8D0EE714E60021D217 /* BochsIA32Plugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 73020E8C0EE714E60021D217 /* BochsIA32Plugin.c */; settings = {COMPILER_FLAGS = "-I../../../platforms/Cross/vm -I../../../platforms/Cross/plugins/BochsIA32Plugin -I\"../../../platforms/Mac OS/vm\" -I../../../spur64src/vm"; }; };
737482B30EE7339F004E10F8 /* libcpu.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 737482B20EE7339F004E10F8 /* libcpu.a */; };
737482B50EE733BD004E10F8 /* libfpu.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 737482B40EE733BD004E10F8 /* libfpu.a */; };
- 737482B70EE7343B004E10F8 /* sqBochsIA32Plugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 737482B60EE7343B004E10F8 /* sqBochsIA32Plugin.cpp */; settings = {COMPILER_FLAGS = "-I../../../processors/IA32/macbochs -I../../../processors/IA32/bochs -I../../../processors/IA32/bochs/instrument/stubs"; }; };
+ 737482B70EE7343B004E10F8 /* sqBochsIA32Plugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 737482B60EE7343B004E10F8 /* sqBochsIA32Plugin.cpp */; settings = {COMPILER_FLAGS = "-I../../bochsx86 -I../../../processors/IA32/bochs -I../../../processors/IA32/bochs/instrument/stubs"; }; };
737483080EE7406A004E10F8 /* libdisasm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 737483070EE7406A004E10F8 /* libdisasm.a */; };
8D01CCCE0486CAD60068D4B7 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */; };
/* End PBXBuildFile section */
@@ -19,10 +19,10 @@
08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
73020E8C0EE714E60021D217 /* BochsIA32Plugin.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = BochsIA32Plugin.c; path = ../../../src/plugins/BochsIA32Plugin/BochsIA32Plugin.c; sourceTree = SOURCE_ROOT; };
73020E8E0EE7158C0021D217 /* BochsIA32Plugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = BochsIA32Plugin.h; path = ../../../platforms/Cross/plugins/BochsIA32Plugin/BochsIA32Plugin.h; sourceTree = SOURCE_ROOT; };
- 737482B20EE7339F004E10F8 /* libcpu.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcpu.a; path = ../../../processors/IA32/macbochs/cpu/libcpu.a; sourceTree = SOURCE_ROOT; };
- 737482B40EE733BD004E10F8 /* libfpu.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfpu.a; path = ../../../processors/IA32/macbochs/fpu/libfpu.a; sourceTree = SOURCE_ROOT; };
+ 737482B20EE7339F004E10F8 /* libcpu.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcpu.a; path = ../../bochsx86/cpu/libcpu.a; sourceTree = SOURCE_ROOT; };
+ 737482B40EE733BD004E10F8 /* libfpu.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfpu.a; path = ../../bochsx86/fpu/libfpu.a; sourceTree = SOURCE_ROOT; };
737482B60EE7343B004E10F8 /* sqBochsIA32Plugin.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = sqBochsIA32Plugin.cpp; path = ../../../platforms/Cross/plugins/BochsIA32Plugin/sqBochsIA32Plugin.cpp; sourceTree = SOURCE_ROOT; };
- 737483070EE7406A004E10F8 /* libdisasm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdisasm.a; path = ../../../processors/IA32/macbochs/disasm/libdisasm.a; sourceTree = SOURCE_ROOT; };
+ 737483070EE7406A004E10F8 /* libdisasm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdisasm.a; path = ../../bochsx86/disasm/libdisasm.a; sourceTree = SOURCE_ROOT; };
8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
8D01CCD20486CAD60068D4B7 /* BochsIA32Plugin.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BochsIA32Plugin.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spur64src/vm/interp.h; sourceTree = SOURCE_ROOT; };
@@ -129,8 +129,12 @@
089C1669FE841209C02AAC07 /* Project object */ = {
isa = PBXProject;
buildConfigurationList = 4FADC23708B4156C00ABE55E /* Build configuration list for PBXProject "BochsIA32Plugin" */;
- compatibilityVersion = "Xcode 2.4";
+ compatibilityVersion = "Xcode 3.2";
+ developmentRegion = English;
hasScannedForEncodings = 1;
+ knownRegions = (
+ en,
+ );
mainGroup = 089C166AFE841209C02AAC07 /* BochsIA32Plugin */;
projectDirPath = "";
projectRoot = "";
@@ -179,9 +183,9 @@
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)",
);
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../processors/IA32/macbochs/cpu\"";
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../../processors/IA32/macbochs/fpu\"";
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/../../../processors/IA32/macbochs/disasm\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../bochsx86/cpu\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../bochsx86/fpu\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/../../bochsx86/disasm\"";
PRODUCT_NAME = BochsIA32Plugin;
WRAPPER_EXTENSION = bundle;
ZERO_LINK = YES;
@@ -202,9 +206,9 @@
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)",
);
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../processors/IA32/macbochs/cpu\"";
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../../processors/IA32/macbochs/fpu\"";
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/../../../processors/IA32/macbochs/disasm\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../bochsx86/cpu\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../bochsx86/fpu\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/../../bochsx86/disasm\"";
PRODUCT_NAME = BochsIA32Plugin;
WRAPPER_EXTENSION = bundle;
};
@@ -214,6 +218,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
CONFIGURATION_TEMP_DIR = "$(PROJECT_TEMP_DIR)/$(CONFIGURATION)";
COPY_PHASE_STRIP = NO;
@@ -221,10 +226,10 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- HEADER_SEARCH_PATHS = /Developer/Headers/FlatCocoa;
+ HEADER_SEARCH_PATHS = "";
PREBINDING = NO;
PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
- MACOSX_DEPLOYMENT_TARGET = 10.6;
+ SDKROOT = macosx;
STRIP_INSTALLED_PRODUCT = NO;
USER_HEADER_SEARCH_PATHS = "";
USE_HEADERMAP = NO;
@@ -235,16 +240,17 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
CONFIGURATION_TEMP_DIR = "$(PROJECT_TEMP_DIR)/$(CONFIGURATION)";
COPY_PHASE_STRIP = NO;
GCC_MODEL_TUNING = "";
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- HEADER_SEARCH_PATHS = /Developer/Headers/FlatCocoa;
+ HEADER_SEARCH_PATHS = "";
PREBINDING = NO;
PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
- MACOSX_DEPLOYMENT_TARGET = 10.6;
+ SDKROOT = macosx;
USER_HEADER_SEARCH_PATHS = "";
USE_HEADERMAP = NO;
};
More information about the Vm-dev
mailing list