From 5ebd63548220d7acf718b7f11de54278b665cb09 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 21 Mar 2010 21:52:28 +0000 Subject: [PATCH] The makefile was a little bit outdated for the gp2x : it did not allow to use the joystick and didn't take care of lua. git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1394 416bcca6-2ee7-4201-b75f-2eb2f807beb1 --- src/Makefile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Makefile b/src/Makefile index a12475ee..526327a9 100644 --- a/src/Makefile +++ b/src/Makefile @@ -229,8 +229,13 @@ else CP = cp ZIP = zip PLATFORMFILES = gfx2.png - LUACOPT = `pkg-config lua5.1 --cflags` - LUALOPT = `pkg-config lua5.1 --libs` + ifeq ($(NOLUA),1) + LUACOPT = + LUALOPT = + else + LUACOPT = `pkg-config lua5.1 --cflags` + LUALOPT = `pkg-config lua5.1 --libs` + endif # These can only be used under linux and maybe freebsd. They allow to compile for the gp2x or to create a windows binary ifdef WIN32CROSS @@ -247,8 +252,8 @@ else #cross compile an exec for the gp2x CC = /opt/open2x/gcc-4.1.1-glibc-2.3.6/arm-open2x-linux/bin/arm-open2x-linux-gcc BIN = ../bin/grafx2.gpe - COPT = -W -Wall -Wdeclaration-after-statement -pedantic -std=c99 -static -g -O3 -I/opt/open2x/gcc-4.1.1-glibc-2.3.6/include `/opt/open2x/gcc-4.1.1-glibc-2.3.6/bin/sdl-config --cflags` $(TTFCOPT) -D__GP2X__ - LOPT = -static -lSDL_image `/opt/open2x/gcc-4.1.1-glibc-2.3.6/bin/sdl-config --static-libs` -ljpeg -lpng -lz -lm $(TTFLOPT) + COPT = -W -Wall -Wdeclaration-after-statement -pedantic -std=c99 -static -g -O$(OPTIM) -I/opt/open2x/gcc-4.1.1-glibc-2.3.6/include `/opt/open2x/gcc-4.1.1-glibc-2.3.6/bin/sdl-config --cflags` $(TTFCOPT) -D__GP2X__ $(TTFCOPT) $(JOYCOPT) $(LUACOPT) $(LAYERCOPT) + LOPT = -static -lSDL_image `/opt/open2x/gcc-4.1.1-glibc-2.3.6/bin/sdl-config --static-libs` -ljpeg -lpng -lz -lm $(TTFLOPT) $(LUALOPT) OBJDIR = ../obj/gp2x NOTTF = 1 PLATFORM = gp2x