diff -ru MinicomputerV1.4/SConstruct MinicomputerV1.4.new/SConstruct --- MinicomputerV1.4/SConstruct 2010-01-30 18:18:53.000000000 +0100 +++ MinicomputerV1.4.new/SConstruct 2010-01-30 19:49:41.639397478 +0100 @@ -2,35 +2,13 @@ print"Minicomputer-------------- " print"- 1/2:configuring" -if ARGUMENTS.get('64bit', 0): - env = Environment(CCFLAGS = '-m64') - guienv = Environment(CPPFLAGS = '-m64') -else: - env = Environment(CCFLAGS = '') - guienv = Environment(CPPFLAGS = '') - -if ARGUMENTS.get('k8', 0): - env.Append(CCFLAGS = ['-march=k8','-mtune=k8','-m3dnow']) - guienv.Append(CPPFLAGS = ['-march=k8','-mtune=k8']) -if ARGUMENTS.get('k7', 0): - env.Append(CCFLAGS = ['-march=athlon-xp','-mtune=athlon-xp']) - guienv.Append(CPPFLAGS = ['-march=athlon-xp','-mtune=athlon-xp']) +env = Environment(CCFLAGS = '') +guienv = Environment(CPPFLAGS = '') # env.Append(CCFLAGS = ' -O3 -mfpmath=sse -msse -msse2 -fverbose-asm -ffast-math -funit-at-a-time -fpeel-loops -ftracer -funswitch-loops -Wall -fmessage-length=0') -env.Append(CCFLAGS = ['-g','-O3','-msse','-fwhole-program','-ftree-vectorize','-ffast-math', '-funit-at-a-time', '-fpeel-loops', '-ftracer','-funswitch-loops','-fprefetch-loop-arrays','-mfpmath=sse']) - -if ARGUMENTS.get('native', 0): - env.Append(CCFLAGS = ['-march=native','-mtune=native']) - guienv.Append(CPPFLAGS = ['-march=native','-mtune=native']) -if ARGUMENTS.get('core2', 0): - env.Append(CCFLAGS = ['-march=core2','-mtune=core2']) - guienv.Append(CPPFLAGS = ['-march=core2','-mtune=core2']) -if ARGUMENTS.get('pentium-m', 0): - env = Environment(CCFLAGS = ['']) - #env.Append(CCFLAGS = ['-march=pentium-m','-mtune=pentium-m']) - #guienv.Append(CPPFLAGS = ['-march=pentium-m','-mtune=pentium-m']) +env.Append(CCFLAGS = ['-g','-O2','-march=i686','-mtune=i686','-msse','-fwhole-program','-ftree-vectorize','-ffast-math', '-funit-at-a-time', '-fpeel-loops', '-ftracer','-funswitch-loops','-fprefetch-loop-arrays','-mfpmath=sse']) conf = Configure(env) if not conf.CheckLibWithHeader('jack', 'jack/jack.h','c'): @@ -63,7 +41,7 @@ print 'Did not find pthread library, exiting!' Exit(1) guienv = guiconf.Finish() -guienv.Append(CPPFLAGS = ['-O3','-Wall','-fmessage-length=0']) +guienv.Append(CPPFLAGS = ['-O2','-march=i686','-mtune=i686','-Wall','-fmessage-length=0']) print"- 2/2:compiling" print"- building the engine:" @@ -75,5 +53,5 @@ guienv.Program('minicomputer',['editor/main.cpp','editor/Memory.cpp','editor/syntheditor.cxx']); -env.Alias(target="install", source=env.Install(dir="/usr/local/bin", source="minicomputer")); -env.Alias(target="install", source=env.Install(dir="/usr/local/bin", source="minicomputerCPU")); +env.Alias(target="install", source=env.Install(dir="PKGDIR/usr/bin", source="minicomputer")); +env.Alias(target="install", source=env.Install(dir="PKGDIR/usr/bin", source="minicomputerCPU")); diff -ru MinicomputerV1.4/installpresets.sh MinicomputerV1.4.new/installpresets.sh --- MinicomputerV1.4/installpresets.sh 2009-11-19 05:46:01.000000000 +0100 +++ MinicomputerV1.4.new/installpresets.sh 2010-01-30 20:27:35.371400244 +0100 @@ -1,14 +1,14 @@ #!/bin/bash -if [ ! -d "${HOME}/.miniComputer" ];then - mkdir "${HOME}/.miniComputer" +if [ ! -d "PKGDIR/usr/share/minicomputer/.miniComputer" ];then + mkdir -p "PKGDIR/usr/share/minicomputer/.miniComputer" fi -if [ -e "${HOME}/.miniComputer/minicomputerMemory.txt" ];then - mv "${HOME}/.miniComputer/minicomputerMemory.txt" "${HOME}/.miniComputer/minicomputerMemory.txt.beforeInstall" - echo "backed up ${HOME}/.miniComputer/minicomputerMemory.txt" +if [ -e "PKGDIR/usr/share/minicomputer/.miniComputer/minicomputerMemory.txt" ];then + mv "PKGDIR/usr/share/minicomputer/.miniComputer/minicomputerMemory.txt" "PKGDIR/usr/share/minicomputer/.miniComputer/minicomputerMemory.txt.beforeInstall" + echo "backed up PKGDIR/usr/share/minicomputer/.miniComputer/minicomputerMemory.txt" fi -if [ -e "${HOME}/.miniComputer/minicomputerMulti.txt" ];then - mv "${HOME}/.miniComputer/minicomputerMulti.txt" "${HOME}/.miniComputer/minicomputerMulti.txt.beforeInstall" - echo "backed up ${HOME}/.miniComputer/minicomputerMulti.txt" +if [ -e "PKGDIR/usr/share/minicomputer/.miniComputer/minicomputerMulti.txt" ];then + mv "PKGDIR/usr/share/minicomputer/.miniComputer/minicomputerMulti.txt" "PKGDIR/usr/share/minicomputer/.miniComputer/minicomputerMulti.txt.beforeInstall" + echo "backed up PKGDIR/usr/share/minicomputer/.miniComputer/minicomputerMulti.txt" fi - cp "factoryPresets/minicomputerMemory.txt" "${HOME}/.miniComputer/minicomputerMemory.txt" - cp "factoryPresets/minicomputerMulti.txt" "${HOME}/.miniComputer/minicomputerMulti.txt" + cp "factoryPresets/minicomputerMemory.txt" "PKGDIR/usr/share/minicomputer/.miniComputer/minicomputerMemory.txt" + cp "factoryPresets/minicomputerMulti.txt" "PKGDIR/usr/share/minicomputer/.miniComputer/minicomputerMulti.txt"