From 294a6800fedeb3063f8acf23d19a29fd0cd58bfd Mon Sep 17 00:00:00 2001 From: Nach Date: Sat, 1 Dec 2007 22:32:36 +0000 Subject: [PATCH] Compiling fixed, more fixes to come soon. git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@131 a31d4220-a93d-0410-bf67-fe4944624d44 --- Makefile | 4 ++-- src/GBA-thumb.cpp | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d7c99106..c4a5af0c 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ CC=gcc CPPC=g++ -CFLAGS=-W -Wall -Wno-unused -DHAVE_NETINET_IN_H -DHAVE_ARPA_INET_H -DFINAL_VERSION -DC_CORE -DSDL -DSYSCONFDIR="home" -DUSE_OPENGL +CFLAGS=-W -Wall -Wno-unused -DHAVE_NETINET_IN_H -DHAVE_ARPA_INET_H -DFINAL_VERSION -DBKPT_SUPPORT -DC_CORE -DSDL -DSYSCONFDIR="home" -DUSE_OPENGL CXXFLAGS=${CFLAGS} ASM=nasm ASMFLAGS=-w-orphan-labels -f elf -DELF -O1 -Isrc/ @@ -44,7 +44,7 @@ MAINOBJ=${MAINDIR}/2xSaI${OE} ${MAINDIR}/admame${OE} ${MAINDIR}/agbprint${OE} ${ ${MAINDIR}/bilinear${OE} ${MAINDIR}/bios${OE} ${MAINDIR}/Cheats${OE} ${MAINDIR}/CheatSearch${OE} \ ${MAINDIR}/EEprom${OE} ${MAINDIR}/elf${OE} ${MAINDIR}/Flash${OE} ${MAINDIR}/GBA${OE} \ ${MAINDIR}/gbafilter${OE} ${MAINDIR}/Gfx${OE} ${MAINDIR}/Globals${OE} ${MAINDIR}/interframe${OE} \ -${MAINDIR}/hq2x${OE} ${MAINDIR}/Mode0${OE} \ +${MAINDIR}/hq2x${OE} ${MAINDIR}/GBA-thumb${OE} ${MAINDIR}/GBA-arm${OE} ${MAINDIR}/Mode0${OE} \ ${MAINDIR}/Mode1${OE} ${MAINDIR}/Mode2${OE} ${MAINDIR}/Mode3${OE} ${MAINDIR}/Mode4${OE} \ ${MAINDIR}/Mode5${OE} ${MAINDIR}/motionblur${OE} ${MAINDIR}/pixel${OE} ${MAINDIR}/portable${OE} \ ${MAINDIR}/remote${OE} ${MAINDIR}/RTC${OE} ${MAINDIR}/scanline${OE} ${MAINDIR}/simpleFilter${OE} \ diff --git a/src/GBA-thumb.cpp b/src/GBA-thumb.cpp index bc00c289..29d421ac 100644 --- a/src/GBA-thumb.cpp +++ b/src/GBA-thumb.cpp @@ -44,7 +44,9 @@ #include "prof/prof.h" #endif +#ifdef _MSC_VER #define snprintf _snprintf +#endif ///////////////////////////////////////////////////////////////////////////