From 1f8c15713d64cf66c6cea6ef98a8ca6ed61fd51c Mon Sep 17 00:00:00 2001 From: "Clifford T. Matthews" Date: Thu, 4 Jun 2009 16:08:31 -0600 Subject: [PATCH] Fixed so SDL version builds. Also mentioned x86_64 compilation using -m32 in README --- README | 25 +++++++++++++++++++++++-- src/config/front-ends/sdl/sdl.make | 7 ++++++- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/README b/README index 1f8513b..9d27156 100644 --- a/README +++ b/README @@ -20,12 +20,33 @@ install of syn68k): make That should leave you with a binary called executor. Unfortunately, without -a System Folder, Executor won't even come close to running. +a System Folder, Executor won't even come close to running. If you're using +a system that can install RPMs and you can dig up and install a copy of +executor-aux-2.1pr16-1.i386.rpm, then you should be able to run. I'll fiddle around a bit and figure out the easiest way to build a -System Folder for Executor from the git repository and add that info next. +System Folder for Executor from the git repository and add that info +next. In the meantime, if anyone is reading this and wants a copy of +executor-aux-2.1pr16-1.i386.rpm, try messaging me (ctm) at github. My email address is still , although ARDI itself is defunct. I get a ridiculous amount of spam and will quite possibly not see email addressed to me. + +If you're on an x86_64 based machine and you have the ability to compile +32-bit binaries, you should be able to build a copy of Executor by doing +something like + + mkdir -p build/debug-linux + cd build/debug-linux + ../../util/configure.sh '--target=i486-linux' '--host=i486-linux' '--front-end=x' '--target-gcc=gcc -m32' '--cflags=-fno-strict-aliasing -I/usr/X11R6/include -DNDEBUG -O0 -finline-functions -g -Wall -DRELEASE_INTERNAL -DERROR_SUPPORTED_MASK="(~0)"' '--root=../..' '--target-file-format=glibc' '--sound=linux' '--syn68k-target=i486-linux-glibc' + make + +However, you may find that you need to hand-edit Makefile and change the line + +HOST_GCC = gcc + +to + +HOST_GCC = gcc -m32 diff --git a/src/config/front-ends/sdl/sdl.make b/src/config/front-ends/sdl/sdl.make index 08a1fef..7369e4c 100644 --- a/src/config/front-ends/sdl/sdl.make +++ b/src/config/front-ends/sdl/sdl.make @@ -13,7 +13,12 @@ endif ifneq (,$(SDL_LIB_DIR)) FRONT_END_LIBS += -L$(SDL_LIB_DIR) endif -FRONT_END_LIBS += -lSDLmain -lSDL + +# I'm not sure when the need for -lSDLmain went away, but it's not needed +# with the version of SDL on Fedora 9 (SDL 1.2.13) + +# FRONT_END_LIBS += -lSDLmain -lSDL +FRONT_END_LIBS += -lSDL # ifneq (,$(findstring linux,$(TARGET))) FRONT_END_LIBS += -ldl -L/usr/X11R6/lib -lX11 -lpthread