From 70a61a07ef456b5927f49841655bc2876cbc9ce4 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Sat, 16 Jan 2010 15:40:05 +0000
Subject: [PATCH] =?UTF-8?q?-Linux=20now=20uses=20pkgconfig=20to=20find=20i?=
 =?UTF-8?q?nfos=20about=20lua.=20This=20may=20break=20other=20platforms=20?=
 =?UTF-8?q?-No=20longer=20enforce=20lua5.1=20as=20the=20include=20dir=20fo?=
 =?UTF-8?q?r=20lua=20files.=20--Cette=20ligne,=20et=20les=20suivantes=20ci?=
 =?UTF-8?q?-dessous,=20seront=20ignor=C3=A9es--?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

M    trunk/Makefile
M    trunk/factory.c


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1255 416bcca6-2ee7-4201-b75f-2eb2f807beb1
---
 Makefile  | 5 +++--
 factory.c | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 511e7b03..6f012867 100644
--- a/Makefile
+++ b/Makefile
@@ -229,6 +229,8 @@ else
       CP = cp
       ZIP = zip
       PLATFORMFILES = gfx2.png
+	  LUACOPT = `pkg-config lua5.1 --cflags`
+	  LUALOPT = `pkg-config lua5.1 --libs`
 
       # 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
@@ -298,8 +300,7 @@ ifeq ($(NOLUA),1)
 	LUALOPT =
 	LUALABEL = -nolua
 else
-	LUACOPT = -D__ENABLE_LUA__
-	LUALOPT = -llua5.1
+	LUACOPT += -D__ENABLE_LUA__
 	LUALABEL =
 endif
 
diff --git a/factory.c b/factory.c
index 75e7cd75..173dbc62 100644
--- a/factory.c
+++ b/factory.c
@@ -39,9 +39,9 @@
 
 #ifdef __ENABLE_LUA__
 
-#include <lua5.1/lua.h>
-#include <lua5.1/lauxlib.h>
-#include <lua5.1/lualib.h>
+#include <lua.h>
+#include <lauxlib.h>
+#include <lualib.h>
 
 // Wrapper functions to call C from Lua