m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-Linux now uses pkgconfig to find infos about lua. This may break other platforms

Browse Source 
-No longer enforce lua5.1 as the include dir for lua files.
--Cette ligne, et les suivantes ci-dessous, seront ignorées--

M    trunk/Makefile
M    trunk/factory.c


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1255 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Adrien Destugues 2010-01-16 15:40:05 +00:00
parent 235d556296
commit 70a61a07ef
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -229,6 +229,8 @@ else
CP = cp CP = cp
ZIP = zip ZIP = zip
PLATFORMFILES = gfx2.png 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 # 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 ifdef WIN32CROSS
@ -298,8 +300,7 @@ ifeq ($(NOLUA),1)
LUALOPT = LUALOPT =
LUALABEL = -nolua LUALABEL = -nolua
else else
LUACOPT = -D__ENABLE_LUA__ LUACOPT += -D__ENABLE_LUA__
LUALOPT = -llua5.1
LUALABEL = LUALABEL =
endif endif

6
factory.c
View File

@ -39,9 +39,9 @@
#ifdef __ENABLE_LUA__ #ifdef __ENABLE_LUA__
#include <lua5.1/lua.h> #include <lua.h>
#include <lua5.1/lauxlib.h> #include <lauxlib.h>
#include <lua5.1/lualib.h> #include <lualib.h>
// Wrapper functions to call C from Lua // Wrapper functions to call C from Lua