From 25fb029aef7f9794ffe4dee549894d7391d5b0df Mon Sep 17 00:00:00 2001 From: Nach Date: Thu, 15 Nov 2007 00:22:35 +0000 Subject: [PATCH] Not compiling in all that junk. Not linking against HQ3x or 4x for the time being, since it's not used by SDL yet. x86-64 supported now. --- Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 86a27bee..9024403e 100644 --- a/Makefile +++ b/Makefile @@ -11,19 +11,20 @@ SDLDIR=src/sdl DMGDIR=src/gb RESAMPLEDIR=src/libresample-0.1.3 +ASMOBJ=${MAINDIR}/hq3x_16.o ${MAINDIR}/hq3x_32.o ${MAINDIR}/hq4x_16.o ${MAINDIR}/hq4x_32.o +CALTERNOBJ= + MAINOBJ=${MAINDIR}/2xSaI.o ${MAINDIR}/admame.o ${MAINDIR}/agbprint.o ${MAINDIR}/armdis.o \ ${MAINDIR}/bilinear.o ${MAINDIR}/bios.o ${MAINDIR}/Cheats.o ${MAINDIR}/CheatSearch.o \ ${MAINDIR}/EEprom.o ${MAINDIR}/elf.o ${MAINDIR}/Flash.o ${MAINDIR}/GBA.o \ -${MAINDIR}/gbafilter.o ${MAINDIR}/Gfx.o ${MAINDIR}/Globals.o ${MAINDIR}/hq2x.o \ -${MAINDIR}/hq3x32.o ${MAINDIR}/hq4x.o ${MAINDIR}/hq_shared32.o ${MAINDIR}/interframe.o \ -${MAINDIR}/lq3x.o ${MAINDIR}/lq4x.o ${MAINDIR}/Mode0.o \ +${MAINDIR}/gbafilter.o ${MAINDIR}/Gfx.o ${MAINDIR}/Globals.o ${MAINDIR}/interframe.o \ +${MAINDIR}/hq2x.o ${MAINDIR}/Mode0.o \ ${MAINDIR}/Mode1.o ${MAINDIR}/Mode2.o ${MAINDIR}/Mode3.o ${MAINDIR}/Mode4.o \ ${MAINDIR}/Mode5.o ${MAINDIR}/motionblur.o ${MAINDIR}/pixel.o ${MAINDIR}/portable.o \ ${MAINDIR}/remote.o ${MAINDIR}/RTC.o ${MAINDIR}/scanline.o ${MAINDIR}/simpleFilter.o \ ${MAINDIR}/snd_interp.o ${MAINDIR}/Sound.o ${MAINDIR}/Sram.o ${MAINDIR}/Text.o \ ${MAINDIR}/unzip.o ${MAINDIR}/Util.o ${MAINDIR}/exprNode.o ${MAINDIR}/getopt.o \ -${MAINDIR}/getopt1.o ${MAINDIR}/memgzio.o ${MAINDIR}/hq3x_16.o ${MAINDIR}/hq3x_32.o \ -${MAINDIR}/hq4x_16.o ${MAINDIR}/hq4x_32.o ${MAINDIR}/expr-lex.o ${MAINDIR}/expr.o +${MAINDIR}/getopt1.o ${MAINDIR}/memgzio.o ${MAINDIR}/expr-lex.o ${MAINDIR}/expr.o DMGOBJ=${DMGDIR}/GB.o ${DMGDIR}/gbCheats.o ${DMGDIR}/gbDis.o ${DMGDIR}/gbGfx.o \ ${DMGDIR}/gbGlobals.o ${DMGDIR}/gbMemory.o ${DMGDIR}/gbPrinter.o ${DMGDIR}/gbSGB.o \