[patch] Syslibs patch

freedroidrpg-0.14.1-syslibs.patch (text/plain), 4.03 KB, created by Stanislav Kogut on 2010-11-27 11:47:34 UTC

diff -ru freedroidrpg-0.14.1.orig/configure.ac freedroidrpg-0.14.1/configure.ac
--- freedroidrpg-0.14.1.orig/configure.ac	2010-11-27 13:25:26.159000084 +0200
+++ freedroidrpg-0.14.1/configure.ac	2010-11-27 13:25:37.765000085 +0200
@@ -110,6 +110,14 @@
 	AC_MSG_ERROR([SDL_image library needed for FreedroidRPG!
 see http://www.libsdl.org/]))
 
+AC_CHECK_LIB([SDL_gfx], [rotozoomSurface],,
+	AC_MSG_ERROR([SDL_gfx library needed to run FreedroidRPG
+see http://www.ferzkopp.net/Software/SDL_gfx-2.0/]))
+
+AC_CHECK_LIB([lua], [luaL_openlibs],,
+	AC_MSG_ERROR([lua library needed to run FreedroidRPG
+see http://www.lua.org/]))
+
 AC_MSG_NOTICE([[Checking for optional SDL libraries:]])
 AC_CHECK_LIB([SDL_mixer], [Mix_ChannelFinished],, AC_MSG_WARN([
 --------------------------------------------------
diff -ru freedroidrpg-0.14.1.orig/src/Makefile.am freedroidrpg-0.14.1/src/Makefile.am
--- freedroidrpg-0.14.1.orig/src/Makefile.am	2010-11-27 13:25:25.622000084 +0200
+++ freedroidrpg-0.14.1/src/Makefile.am	2010-11-27 13:27:17.799000091 +0200
@@ -1,9 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
-freedroidRPG_LDADD = ../lua/liblua.a
-
 if WIN32
-freedroidRPG_LDADD += ../win32/freedroidRPG.coff
+freedroidRPG_LDADD = ../win32/freedroidRPG.coff
 endif
 
 bin_PROGRAMS = freedroidRPG
@@ -22,7 +20,7 @@
 	enemy.c input.c keyboard.c main.c hud.c view.c automap.c BFont.c \
 	defs.h map.h vars.h takeover.h global.h \
 	proto.h struct.h system.h BFont.h \
-	SDL_rotozoom.c SDL_rotozoom.h open_gl.c open_gl_atlas.c mission.c chat.c light.c \
+	open_gl.c open_gl_atlas.c mission.c chat.c light.c \
 	getopt.c getopt1.c getopt.h scandir.c scandir.h sound.h sound_effects.c \
 	lang.h lists.c lists.h gen_savestruct.py savestruct.c savestruct.h string.c pathfinder.c \
 	benchmark.c \
@@ -56,8 +54,3 @@
 savestruct.c savestruct.h: struct.h gen_savestruct.py
 	python gen_savestruct.py struct.h savestruct
 
-clean-local:
-	cd ../lua; make clean
-
-../lua/liblua.a: 
-	cd ../lua; make CC=${CC} AR="${AR} rcu" RANLIB="${RANLIB}" liblua.a
Only in freedroidrpg-0.14.1/src: Makefile.am.rej
diff -ru freedroidrpg-0.14.1.orig/src/Makefile.in freedroidrpg-0.14.1/src/Makefile.in
--- freedroidrpg-0.14.1.orig/src/Makefile.in	2010-11-27 13:25:25.618000084 +0200
+++ freedroidrpg-0.14.1/src/Makefile.in	2010-11-27 13:35:42.455000084 +0200
@@ -211,7 +211,7 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-freedroidRPG_LDADD = ../lua/liblua.a $(am__append_1)
+freedroidRPG_LDADD = $(am__append_1)
 EXTRA_DIST = 
 freedroidRPG_SOURCES = menu.c shop.c items.c character.c skills.c saveloadgame.c \
 	event.c dynarray.c item_upgrades.c item_upgrades_ui.c addon_crafting_ui.c \
diff -ru freedroidrpg-0.14.1.orig/src/lua.c freedroidrpg-0.14.1/src/lua.c
--- freedroidrpg-0.14.1.orig/src/lua.c	2010-11-27 13:25:25.620000084 +0200
+++ freedroidrpg-0.14.1/src/lua.c	2010-11-27 13:25:37.769000085 +0200
@@ -37,9 +37,9 @@
 #include "lvledit/lvledit_actions.h"
 #include "lvledit/lvledit_map.h"
 
-#include "../lua/lua.h"
-#include "../lua/lauxlib.h"
-#include "../lua/lualib.h"
+#include <lua.h>
+#include <lauxlib.h>
+#include <lualib.h>
 
 /* Our Lua state for event execution */
 lua_State *global_lua_state;
diff -ru freedroidrpg-0.14.1.orig/src/luaconfig.c freedroidrpg-0.14.1/src/luaconfig.c
--- freedroidrpg-0.14.1.orig/src/luaconfig.c	2010-11-27 13:25:25.618000084 +0200
+++ freedroidrpg-0.14.1/src/luaconfig.c	2010-11-27 13:39:45.228000086 +0200
@@ -33,8 +33,8 @@
 #include "global.h"
 #include "proto.h"
 
-#include "../lua/lua.h"
-#include "../lua/lauxlib.h"
+#include <lua.h>
+#include <lauxlib.h>
 
 /* Our Lua state for event execution (defined in lua.c) */
 extern lua_State *global_lua_state;
diff -ru freedroidrpg-0.14.1.orig/src/system.h freedroidrpg-0.14.1/src/system.h
--- freedroidrpg-0.14.1.orig/src/system.h	2010-11-27 13:25:25.620000084 +0200
+++ freedroidrpg-0.14.1/src/system.h	2010-11-27 13:25:37.773000085 +0200
@@ -111,6 +111,7 @@
 
 #include "SDL.h"
 #include "SDL_image.h"
+#include "SDL_rotozoom.h"
 
 #ifdef HAVE_LIBSDL_MIXER
 #include "SDL_mixer.h"