Attachment #255567 for bug #346945

View | Details | Raw Unified | Return to bug 346945
Collapse All | Expand All

Lines 110-115 Link Here

(-)freedroidrpg-0.14.1.orig/configure.ac (+8 lines)
110	AC_MSG_ERROR([SDL_image library needed for FreedroidRPG!	110	AC_MSG_ERROR([SDL_image library needed for FreedroidRPG!
111	see http://www.libsdl.org/]))	111	see http://www.libsdl.org/]))
112		112
		113	AC_CHECK_LIB([SDL_gfx], [rotozoomSurface],,
		114	AC_MSG_ERROR([SDL_gfx library needed to run FreedroidRPG
		115	see http://www.ferzkopp.net/Software/SDL_gfx-2.0/]))
		116
		117	AC_CHECK_LIB([lua], [luaL_openlibs],,
		118	AC_MSG_ERROR([lua library needed to run FreedroidRPG
		119	see http://www.lua.org/]))
		120
113	AC_MSG_NOTICE([[Checking for optional SDL libraries:]])	121	AC_MSG_NOTICE([[Checking for optional SDL libraries:]])
114	AC_CHECK_LIB([SDL_mixer], [Mix_ChannelFinished],, AC_MSG_WARN([	122	AC_CHECK_LIB([SDL_mixer], [Mix_ChannelFinished],, AC_MSG_WARN([
115	--------------------------------------------------	123	--------------------------------------------------




## Process this file with automake to produce Makefile.in

freedroidRPG_LDADD = ../lua/liblua.a

if WIN32
freedroidRPG_LDADD = ../win32/freedroidRPG.coff
endif

bin_PROGRAMS = freedroidRPG

	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 \
	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 \

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

Lines 211-217 Link Here

(-)freedroidrpg-0.14.1.orig/src/Makefile.in (-1 / +1 lines)
211	top_build_prefix = @top_build_prefix@	211	top_build_prefix = @top_build_prefix@
212	top_builddir = @top_builddir@	212	top_builddir = @top_builddir@
213	top_srcdir = @top_srcdir@	213	top_srcdir = @top_srcdir@
214	freedroidRPG_LDADD = ../lua/liblua.a $(am__append_1)	214	freedroidRPG_LDADD = $(am__append_1)
215	EXTRA_DIST =	215	EXTRA_DIST =
216	freedroidRPG_SOURCES = menu.c shop.c items.c character.c skills.c saveloadgame.c \	216	freedroidRPG_SOURCES = menu.c shop.c items.c character.c skills.c saveloadgame.c \
217	event.c dynarray.c item_upgrades.c item_upgrades_ui.c addon_crafting_ui.c \	217	event.c dynarray.c item_upgrades.c item_upgrades_ui.c addon_crafting_ui.c \

Lines 37-45 Link Here

(-)freedroidrpg-0.14.1.orig/src/lua.c (-3 / +3 lines)
37	#include "lvledit/lvledit_actions.h"	37	#include "lvledit/lvledit_actions.h"
38	#include "lvledit/lvledit_map.h"	38	#include "lvledit/lvledit_map.h"
39		39
40	#include "../lua/lua.h"	40	#include <lua.h>
41	#include "../lua/lauxlib.h"	41	#include <lauxlib.h>
42	#include "../lua/lualib.h"	42	#include <lualib.h>
43		43
44	/* Our Lua state for event execution */	44	/* Our Lua state for event execution */
45	lua_State *global_lua_state;	45	lua_State *global_lua_state;

Lines 33-40 Link Here

(-)freedroidrpg-0.14.1.orig/src/luaconfig.c (-2 / +2 lines)
33	#include "global.h"	33	#include "global.h"
34	#include "proto.h"	34	#include "proto.h"
35		35
36	#include "../lua/lua.h"	36	#include <lua.h>
37	#include "../lua/lauxlib.h"	37	#include <lauxlib.h>
38		38
39	/* Our Lua state for event execution (defined in lua.c) */	39	/* Our Lua state for event execution (defined in lua.c) */
40	extern lua_State *global_lua_state;	40	extern lua_State *global_lua_state;

Lines 111-116 Link Here

(-)freedroidrpg-0.14.1.orig/src/system.h (+1 lines)
111		111
112	#include "SDL.h"	112	#include "SDL.h"
113	#include "SDL_image.h"	113	#include "SDL_image.h"
		114	#include "SDL_rotozoom.h"
114		115
115	#ifdef HAVE_LIBSDL_MIXER	116	#ifdef HAVE_LIBSDL_MIXER
116	#include "SDL_mixer.h"	117	#include "SDL_mixer.h"

Return to bug 346945

Lines 1-9 Link Here

(-)freedroidrpg-0.14.1.orig/src/Makefile.am (-9 / +2 lines)
1	## Process this file with automake to produce Makefile.in	1	## Process this file with automake to produce Makefile.in
2		2
3	freedroidRPG_LDADD = ../lua/liblua.a
4
5	if WIN32	3	if WIN32
6	freedroidRPG_LDADD += ../win32/freedroidRPG.coff	4	freedroidRPG_LDADD = ../win32/freedroidRPG.coff
7	endif	5	endif
8		6
9	bin_PROGRAMS = freedroidRPG	7	bin_PROGRAMS = freedroidRPG
Lines 22-28 Link Here
22	enemy.c input.c keyboard.c main.c hud.c view.c automap.c BFont.c \	20	enemy.c input.c keyboard.c main.c hud.c view.c automap.c BFont.c \
23	defs.h map.h vars.h takeover.h global.h \	21	defs.h map.h vars.h takeover.h global.h \
24	proto.h struct.h system.h BFont.h \	22	proto.h struct.h system.h BFont.h \
25	SDL_rotozoom.c SDL_rotozoom.h open_gl.c open_gl_atlas.c mission.c chat.c light.c \	23	open_gl.c open_gl_atlas.c mission.c chat.c light.c \
26	getopt.c getopt1.c getopt.h scandir.c scandir.h sound.h sound_effects.c \	24	getopt.c getopt1.c getopt.h scandir.c scandir.h sound.h sound_effects.c \
27	lang.h lists.c lists.h gen_savestruct.py savestruct.c savestruct.h string.c pathfinder.c \	25	lang.h lists.c lists.h gen_savestruct.py savestruct.c savestruct.h string.c pathfinder.c \
28	benchmark.c \	26	benchmark.c \
Lines 56-63 Link Here
56	savestruct.c savestruct.h: struct.h gen_savestruct.py	54	savestruct.c savestruct.h: struct.h gen_savestruct.py
57	python gen_savestruct.py struct.h savestruct	55	python gen_savestruct.py struct.h savestruct
58		56
59	clean-local:
60	cd ../lua; make clean
61
62	../lua/liblua.a:
63	cd ../lua; make CC=${CC} AR="${AR} rcu" RANLIB="${RANLIB}" liblua.a