Revision: 3480 Author: eliot Date: 2015-10-25 21:05:32 -0700 (Sun, 25 Oct 2015) Log Message: ----------- Add the new Bochs plugin build structure to the build.linux32x86 directory. Add Clement's ubuntu build config info to the linux HowToBuild.
Modified Paths: -------------- branches/Cog/build.linux32x86/HowToBuild branches/Cog/build.linux32x86/bochsx64/conf.COG branches/Cog/build.linux32x86/bochsx64/conf.COG.dbg branches/Cog/build.linux32x86/bochsx86/conf.COG branches/Cog/platforms/unix/plugins/BochsIA32Plugin/Makefile.inc
Added Paths: ----------- branches/Cog/build.linux32x86/bochsx64/ branches/Cog/build.linux32x86/bochsx86/ branches/Cog/platforms/unix/plugins/BochsX64Plugin/ branches/Cog/platforms/unix/plugins/BochsX64Plugin/Makefile.inc
Modified: branches/Cog/build.linux32x86/HowToBuild =================================================================== --- branches/Cog/build.linux32x86/HowToBuild 2015-10-21 23:18:32 UTC (rev 3479) +++ branches/Cog/build.linux32x86/HowToBuild 2015-10-26 04:05:32 UTC (rev 3480) @@ -244,3 +244,15 @@ sudo apt-get install libpango1.0-dev
More advice and examples for other distros gratefully received. + + +Clement Bera's Ubuntu install script +sudo apt-get install cmake zip bash-completion ruby git xz-utils debhelper devscripts +sudo apt-get install libc6-dev:i386 libasound2:i386 libasound2-dev:i386 libasound2-plugins:i386 libssl-dev:i386 libssl0.9.8:i386 libfreetype6-dev:i386 libx11-dev:i386 libsm-dev:i386 libice-dev:i386 +sudo apt-get install build-essential gcc-multilib g++ +sudo apt-get install libgl1-mesa-dev libgl1-mesa-glx:i386 +sudo apt-get install binutils:i386 g++-4.6:i386 gcc-4.6:i386 +sudo ln -s /usr/lib/i386-linux-gnu/mesa/libGL.so /usr/lib/i386-linux-gnu/libGL.so +sudo ln -s /usr/lib/i386-linux-gnu/mesa/libGL.so.1 /usr/lib/i386-linux-gnu/mesa/libGL.so +sudo apt-get install uuid-dev:i386 +sudo apt-get install subversion
Modified: branches/Cog/build.linux32x86/bochsx64/conf.COG =================================================================== --- branches/Cog/build.macos32x86/bochsx64/conf.COG 2015-10-21 23:18:32 UTC (rev 3479) +++ branches/Cog/build.linux32x86/bochsx64/conf.COG 2015-10-26 04:05:32 UTC (rev 3480) @@ -1,7 +1,7 @@ #!/bin/sh
# Bochs x64 simulator for the BochsX64Alien plugin. -# this sets up the x64 compile for Cog on Mac OS X. Disable as much inessential +# this sets up the x64 compile for Cog on linux. Disable as much inessential # stuff as possible leaving only the cpu/fpu & memory interface
# build cpu/libcpu.a disasm/libdisasm.a fpu/libfpu.a using
Modified: branches/Cog/build.linux32x86/bochsx64/conf.COG.dbg =================================================================== --- branches/Cog/build.macos32x86/bochsx64/conf.COG.dbg 2015-10-21 23:18:32 UTC (rev 3479) +++ branches/Cog/build.linux32x86/bochsx64/conf.COG.dbg 2015-10-26 04:05:32 UTC (rev 3480) @@ -1,7 +1,7 @@ #!/bin/sh
# Bochs x64 simulator for the BochsX64Alien plugin. -# this sets up the x64 compile for Cog on Mac OS X. Disable as much inessential +# this sets up the x64 compile for Cog on linux. Disable as much inessential # stuff as possible leaving only the cpu/fpu & memory interface
# build cpu/libcpu.a disasm/libdisasm.a fpu/libfpu.a using
Modified: branches/Cog/build.linux32x86/bochsx86/conf.COG =================================================================== --- branches/Cog/build.macos32x86/bochsx86/conf.COG 2015-10-21 23:18:32 UTC (rev 3479) +++ branches/Cog/build.linux32x86/bochsx86/conf.COG 2015-10-26 04:05:32 UTC (rev 3480) @@ -1,7 +1,7 @@ #!/bin/sh
# Bochs x86 simulator for the BochsIA32Alien plugin. -# this sets up the x86 compile for Cog on Mac OS X. Disable as much inessential +# this sets up the x86 compile for Cog on linux. Disable as much inessential # stuff as possible leaving only the cpu/fpu & memory interface
# build cpu/libcpu.a disasm/libdisasm.a fpu/libfpu.a using
Modified: branches/Cog/platforms/unix/plugins/BochsIA32Plugin/Makefile.inc =================================================================== --- branches/Cog/platforms/unix/plugins/BochsIA32Plugin/Makefile.inc 2015-10-21 23:18:32 UTC (rev 3479) +++ branches/Cog/platforms/unix/plugins/BochsIA32Plugin/Makefile.inc 2015-10-26 04:05:32 UTC (rev 3480) @@ -1,11 +1,11 @@ XCFLAGS=-m32 XCPPFLAGS= -m32 -DUSE_BOCHS_CONFIG_H=1 \ - -I$(topdir)/processors/IA32/linuxbochs \ + -I../../../bochsx32 \ -I$(topdir)/processors/IA32/bochs \ -I$(topdir)/processors/IA32/bochs/instrument/stubs
-XLDFLAGS= -L$(topdir)/processors/IA32/linuxbochs/cpu \ - -L$(topdir)/processors/IA32/linuxbochs/fpu \ - -L$(topdir)/processors/IA32/linuxbochs/disasm \ +XLDFLAGS= -L../../../bochsx32/cpu \ + -L../../../bochsx32/fpu \ + -L../../../bochsx32/disasm \ -lcpu -lfpu -ldisasm \ -lstdc++
Added: branches/Cog/platforms/unix/plugins/BochsX64Plugin/Makefile.inc =================================================================== --- branches/Cog/platforms/unix/plugins/BochsX64Plugin/Makefile.inc (rev 0) +++ branches/Cog/platforms/unix/plugins/BochsX64Plugin/Makefile.inc 2015-10-26 04:05:32 UTC (rev 3480) @@ -0,0 +1,11 @@ +XCFLAGS=-m32 +XCPPFLAGS= -m32 -DUSE_BOCHS_CONFIG_H=1 \ + -I../../../bochsx64 \ + -I$(topdir)/processors/IA32/bochs \ + -I$(topdir)/processors/IA32/bochs/instrument/stubs + +XLDFLAGS= -L../../../bochsx64/cpu \ + -L../../../bochsx64/fpu \ + -L../../../bochsx64/disasm \ + -lcpu -lfpu -ldisasm \ + -lstdc++
vm-dev@lists.squeakfoundation.org