[Vm-dev] [commit][3493] Fix a slip in the linux BochsIA32Plugin makefile.

[commits at squeakvm.org]

Revision: 3493
Author:   eliot
Date:     2015-11-11 18:18:21 -0800 (Wed, 11 Nov 2015)
Log Message:
-----------
Fix a slip in the linux BochsIA32Plugin makefile.
Partially correct include paths in the Mac Spur GdbARMPlugin xcode project, but
it still doesn't build.

Modified Paths:
--------------
    branches/Cog/build.macos32x86/squeak.cog.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj
    branches/Cog/platforms/unix/plugins/BochsIA32Plugin/Makefile.inc

Modified: branches/Cog/build.macos32x86/squeak.cog.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj	2015-11-12 01:53:26 UTC (rev 3492)
+++ branches/Cog/build.macos32x86/squeak.cog.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj	2015-11-12 02:18:21 UTC (rev 3493)
@@ -13,7 +13,7 @@
 		732788241AB7C73500BE5008 /* environ.c in Sources */ = {isa = PBXBuildFile; fileRef = 732787F11AB7A12A00BE5008 /* environ.c */; };
 		737482B30EE7339F004E10F8 /* libopcodes.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 737482B20EE7339F004E10F8 /* libopcodes.a */; };
 		737482B50EE733BD004E10F8 /* libsim.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 737482B40EE733BD004E10F8 /* libsim.a */; };
-		737482B70EE7343B004E10F8 /* sqGdbARMPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 737482B60EE7343B004E10F8 /* sqGdbARMPlugin.c */; settings = {COMPILER_FLAGS = "-I../../../processors/ARM/mac/gdb-7.10/include -I../../../processors/ARM/mac/gdb-7.10/sim/arm -I../../../processors/ARM/mac/gdb-7.10/bfd"; }; };
+		737482B70EE7343B004E10F8 /* sqGdbARMPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 737482B60EE7343B004E10F8 /* sqGdbARMPlugin.c */; settings = {COMPILER_FLAGS = "-I../../../processors/ARM/mac/gdb-7.10/include -I../../../processors/ARM/mac/gdb-7.10/sim/arm -I../../../processors/ARM/mac/gdb-7.10/bfd -I../../gdbarm32/opcodes -I../../gdbarm32/bfd"; }; };
 		8D01CCCE0486CAD60068D4B7 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */; };
 /* End PBXBuildFile section */
 

Modified: branches/Cog/platforms/unix/plugins/BochsIA32Plugin/Makefile.inc
===================================================================
--- branches/Cog/platforms/unix/plugins/BochsIA32Plugin/Makefile.inc	2015-11-12 01:53:26 UTC (rev 3492)
+++ branches/Cog/platforms/unix/plugins/BochsIA32Plugin/Makefile.inc	2015-11-12 02:18:21 UTC (rev 3493)
@@ -1,11 +1,11 @@
 XCFLAGS=-m32
 XCPPFLAGS=	-m32 -DUSE_BOCHS_CONFIG_H=1 \
-			-I../../../bochsx32 \
+			-I../../../bochsx86 \
 			-I$(topdir)/processors/IA32/bochs \
 			-I$(topdir)/processors/IA32/bochs/instrument/stubs
 
-XLDFLAGS=	-L../../../bochsx32/cpu \
-			-L../../../bochsx32/fpu \
-			-L../../../bochsx32/disasm \
+XLDFLAGS=	-L../../../bochsx86/cpu \
+			-L../../../bochsx86/fpu \
+			-L../../../bochsx86/disasm \
 			-lcpu -lfpu -ldisasm \
 			-lstdc++