[Vm-dev] [commit][3594] Get the Bochs plugins to compile under the new common/ Makefile.plugin regime

commits at squeakvm.org commits at squeakvm.org
Sat Feb 13 23:46:03 UTC 2016


Revision: 3594
Author:   eliot
Date:     2016-02-13 15:45:59 -0800 (Sat, 13 Feb 2016)
Log Message:
-----------
Get the Bochs plugins to compile under the new common/Makefile.plugin regime

Modified Paths:
--------------
    trunk/platforms/win32/plugins/BochsIA32Plugin/Makefile.plugin

Added Paths:
-----------
    trunk/platforms/win32/plugins/BochsX64Plugin/
    trunk/platforms/win32/plugins/BochsX64Plugin/Makefile.plugin

Removed Paths:
-------------
    trunk/platforms/win32/plugins/BochsX64Plugin/Makefile

Modified: trunk/platforms/win32/plugins/BochsIA32Plugin/Makefile.plugin
===================================================================
--- trunk/platforms/win32/plugins/BochsIA32Plugin/Makefile.plugin	2016-02-13 23:09:50 UTC (rev 3593)
+++ trunk/platforms/win32/plugins/BochsIA32Plugin/Makefile.plugin	2016-02-13 23:45:59 UTC (rev 3594)
@@ -1,24 +1,17 @@
-DLLTOOLEXTRA := $(PLATDIR)/../processors/IA32/winbochs/cpu/libcpu.a \
-				$(PLATDIR)/../processors/IA32/winbochs/fpu/libfpu.a \
-				$(PLATDIR)/../processors/IA32/winbochs/disasm/libdisasm.a
+DLLTOOLEXTRA := ../bochsx86/cpu/libcpu.a \
+				../bochsx86/fpu/libfpu.a \
+				../bochsx86/disasm/libdisasm.a
 DLLWRAPEXTRA := $(DLLTOOLEXTRA)
 
 LINK_WITH_GPP := yes
-EXTRALIBS:= -L$(PLATDIR)/../processors/IA32/winbochs/cpu \
-			-L$(PLATDIR)/../processors/IA32/winbochs/fpu \
-			-L$(PLATDIR)/../processors/IA32/winbochs/disasm \
+EXTRALIBS:= -L../bochsx86/cpu -L../bochsx86/fpu -L../bochsx86/disasm \
 			-lcpu -lfpu -ldisasm
 
 include ../common/Makefile.plugin
 
-CXXINCLUDES:= -I$(PLATDIR)/../processors/IA32/winbochs \
-			  -I$(PLATDIR)/../processors/IA32/bochs \
-			  -I$(PLATDIR)/../processors/IA32/bochs/instrument/stubs
+INCLUDES+=-I../bochsx86 \
+         -I../../processors/IA32/bochs \
+		 -I../../processors/IA32/bochs/instrument/stubs
 
-CXXFLAGS:=	-m32 -mno-cygwin -DWIN32 -msse2 -ggdb2 -mwindows -mthreads -mwin32 \
+CFLAGS:=	-m32 -mno-cygwin -DWIN32 -msse2 -ggdb2 -mwindows -mthreads -mwin32 \
 			-mno-rtd -mms-bitfields -mno-accumulate-outgoing-args
-
-.cpp.o:
-		$(CXX) -c $(CXXFLAGS) $(CXXINCLUDES) $<
-
-CXX:=g++

Deleted: trunk/platforms/win32/plugins/BochsX64Plugin/Makefile
===================================================================
--- trunk/platforms/win32/plugins/BochsIA32Plugin/Makefile	2016-02-12 19:32:34 UTC (rev 3589)
+++ trunk/platforms/win32/plugins/BochsX64Plugin/Makefile	2016-02-13 23:45:59 UTC (rev 3594)
@@ -1,24 +0,0 @@
-DLLTOOLEXTRA := $(PLATDIR)/../processors/IA32/winbochs/cpu/libcpu.a \
-				$(PLATDIR)/../processors/IA32/winbochs/fpu/libfpu.a \
-				$(PLATDIR)/../processors/IA32/winbochs/disasm/libdisasm.a
-DLLWRAPEXTRA := $(DLLTOOLEXTRA)
-
-LINK_WITH_GPP := yes
-EXTRALIBS:= -L$(PLATDIR)/../processors/IA32/winbochs/cpu \
-			-L$(PLATDIR)/../processors/IA32/winbochs/fpu \
-			-L$(PLATDIR)/../processors/IA32/winbochs/disasm \
-			-lcpu -lfpu -ldisasm
-
-include ../../Makefile.plugin
-
-CXXINCLUDES:= -I$(PLATDIR)/../processors/IA32/winbochs \
-			  -I$(PLATDIR)/../processors/IA32/bochs \
-			  -I$(PLATDIR)/../processors/IA32/bochs/instrument/stubs
-
-CXXFLAGS:=	-m32 -mno-cygwin -DWIN32 -msse2 -ggdb2 -mwindows -mthreads -mwin32 \
-			-mno-rtd -mms-bitfields -mno-accumulate-outgoing-args
-
-.cpp.o:
-		$(CXX) -c $(CXXFLAGS) $(CXXINCLUDES) $<
-
-CXX:=g++

Copied: trunk/platforms/win32/plugins/BochsX64Plugin/Makefile.plugin (from rev 3593, trunk/platforms/win32/plugins/BochsIA32Plugin/Makefile.plugin)
===================================================================
--- trunk/platforms/win32/plugins/BochsX64Plugin/Makefile.plugin	                        (rev 0)
+++ trunk/platforms/win32/plugins/BochsX64Plugin/Makefile.plugin	2016-02-13 23:45:59 UTC (rev 3594)
@@ -0,0 +1,17 @@
+DLLTOOLEXTRA := ../bochsx64/cpu/libcpu.a \
+				../bochsx64/fpu/libfpu.a \
+				../bochsx64/disasm/libdisasm.a
+DLLWRAPEXTRA := $(DLLTOOLEXTRA)
+
+LINK_WITH_GPP := yes
+EXTRALIBS:= -L../bochsx64/cpu -L../bochsx64/fpu -L../bochsx64/disasm \
+			-lcpu -lfpu -ldisasm
+
+include ../common/Makefile.plugin
+
+INCLUDES+=-I../bochsx64 \
+         -I../../processors/IA32/bochs \
+		 -I../../processors/IA32/bochs/instrument/stubs
+
+CFLAGS:=	-m32 -mno-cygwin -DWIN32 -msse2 -ggdb2 -mwindows -mthreads -mwin32 \
+			-mno-rtd -mms-bitfields -mno-accumulate-outgoing-args



More information about the Vm-dev mailing list