Attachment #126147 for bug #116062

Lines 1-5 Link Here

(-)./glkloader-0.3.2/xpconfig/internal-build-script~ (-1 / +1 lines)
1	#!/bin/sh	1	#!/bin/sh
2	if [ ! -f Makefile ]; then	2	if [ ! -f Makefile ]; then
3	./configure --with-method=rcfile --disable-shared	3	./configure --with-method=rcfile --disable-shared \|\| exit $?
4	fi	4	fi
5	make	5	make

Lines 33-38 Link Here

(-)./glkloader-0.3.2/xpconfig/xpconfig.c~ (+2 lines)
33		33
34	#include <assert.h>	34	#include <assert.h>
35	#include <string.h>	35	#include <string.h>
		36	#include <stdio.h>
		37	#include <stdlib.h>
36		38
37	#include "xpconfig.h"	39	#include "xpconfig.h"
38		40




# and glk.h, glkstart.h, and Make.glkloader in the include directory.

GLKNAME = glkloader
GLKINCLUDEDIR = /usr/include/glk/
GLKLIBDIR = /usr/lib/

# Pick a C compiler.
#CC = cc

LINK = gcc
INSTALL = install -g 0 -o 0

OPTIONS = -Wall -fPIC -DLINUX
INCLUDEDIRS = -I$(GLKINCLUDEDIR) -I.

CFLAGS += $(OPTIONS) $(INCLUDEDIRS)
LDFLAGS = -rdynamic
LIBDIRS =
LIBS = -ldl


all: $(GLKLIBSTATIC) $(GLKLIBSHARED) $(GLKMAKEFILE)

$(GLKLIBSTATIC): $(OBJS) xpconfig/libxpconfig.la
	cd xpconfig && ./internal-build-script 
	ar r $(GLKLIBSTATIC) $(OBJS)
	ranlib $(GLKLIBSTATIC)

$(GLKLIBSHARED): $(OBJS) xpconfig/libxpconfig.la
	cd xpconfig && ./internal-build-script 
	$(LINK) $(LDFLAGS) -shared -Wl,-soname,$(GLKLIBSHARED).$(MAJOR) -o $(GLKLIBSHARED).$(MAJOR).$(MINOR).$(MICRO) $(OBJS) $(LIBDIRS) $(LIBS) $(XPCONFIG)

xpconfig/libxpconfig.la:
	cd xpconfig && ./internal-build-script

$(GLKMAKEFILE):
	echo LINKLIBS = $(LIBDIRS) $(LIBS) > $(GLKMAKEFILE)
	echo GLKLIB = -l$(GLKNAME) >> $(GLKMAKEFILE)

	ln -s -f $(GLKLIBDIR)/$(GLKLIBSHARED).$(MAJOR).$(MINOR).$(MICRO) $(GLKLIBDIR)/$(GLKLIBSHARED).$(MAJOR).$(MINOR)
	ln -s -f $(GLKLIBDIR)/$(GLKLIBSHARED).$(MAJOR).$(MINOR).$(MICRO) $(GLKLIBDIR)/$(GLKLIBSHARED).$(MAJOR)
	ln -s -f $(GLKLIBDIR)/$(GLKLIBSHARED).$(MAJOR).$(MINOR).$(MICRO) $(GLKLIBDIR)/$(GLKLIBSHARED)
	ldconfig

uninstall:
	rm -f $(GLKINCLUDEDIR)/$(GLKMAKEFILE)

Lines 29-34 Link Here

(-)./glkloader-0.3.2/glkloader.c~ (+1 lines)
29		29
30	#include <stdlib.h>	30	#include <stdlib.h>
31	#include <stdio.h>	31	#include <stdio.h>
		32	#include <string.h>
32	#include <glk.h>	33	#include <glk.h>
33		34
34	#include "defines.h"	35	#include "defines.h"

Lines 282-287 Link Here

(-)./glkloader-0.3.2/generate_glkfuncs.pl~ (+1 lines)
282		282
283	# Global definitions	283	# Global definitions
284	print OUT_FILE "#include <stdio.h>\n";	284	print OUT_FILE "#include <stdio.h>\n";
		285	print OUT_FILE "#include <stdlib.h>\n";
285	print OUT_FILE "#include <glk.h>\n";	286	print OUT_FILE "#include <glk.h>\n";
286	print OUT_FILE "\n";	287	print OUT_FILE "\n";
287	print OUT_FILE "#include \"defines.h\"\n";	288	print OUT_FILE "#include \"defines.h\"\n";

Lines 32-37 Link Here

(-)./glkloader-0.3.2/xpconfig/applist.c~ (+1 lines)
32	#endif	32	#endif
33		33
34	#include <string.h>	34	#include <string.h>
		35	#include <stdlib.h>
35		36
36	#include "applist.h"	37	#include "applist.h"
37	#include "sectionlist.h"	38	#include "sectionlist.h"

Lines 32-37 Link Here

(-)./glkloader-0.3.2/xpconfig/sectionlist.c~ (+1 lines)
32	#endif	32	#endif
33		33
34	#include <string.h>	34	#include <string.h>
		35	#include <stdlib.h>
35		36
36	#include "sectionlist.h"	37	#include "sectionlist.h"
37	#include "keylist.h"	38	#include "keylist.h"

Lines 32-37 Link Here

(-)./glkloader-0.3.2/xpconfig/keylist.c~ (+2 lines)
32	#endif	32	#endif
33		33
34	#include <string.h>	34	#include <string.h>
		35	#include <stdio.h>
		36	#include <stdlib.h>
35		37
36	#include "keylist.h"	38	#include "keylist.h"
37		39

Lines 405-411 Link Here

(-)./glkloader-0.3.2/xpconfig/platform_rcfile.c~ (-1 lines)
405	sprintf( filename, "%s/.%src", dirname, application );	405	sprintf( filename, "%s/.%src", dirname, application );
406	parseConfigFile( filename, application );	406	parseConfigFile( filename, application );
407	free( filename );	407	free( filename );
408	free( dirname );
409	}	408	}
410	}	409	}
411		410

Lines 17-24 Link Here

(-)./glkloader-0.3.2/glk.h~ (-2 / +3 lines)
17	/* You may have to edit the definition of glui32 to make sure it's really a	17	/* You may have to edit the definition of glui32 to make sure it's really a
18	32-bit unsigned integer type, and glsi32 to make sure it's really a	18	32-bit unsigned integer type, and glsi32 to make sure it's really a
19	32-bit signed integer type. If they're not, horrible things will happen. */	19	32-bit signed integer type. If they're not, horrible things will happen. */
20	typedef unsigned long glui32;	20	#include <stdint.h>
21	typedef signed long glsi32;	21	typedef uint32_t glui32;
		22	typedef int32_t glsi32;
22		23
23	/* These are the compile-time conditionals that reveal various Glk optional	24	/* These are the compile-time conditionals that reveal various Glk optional
24	modules. */	25	modules. */

Return to bug 116062

Lines 13-20 Link Here

(-)./glkloader-0.3.2/Makefile~ (-10 / +10 lines)
13	# and glk.h, glkstart.h, and Make.glkloader in the include directory.	13	# and glk.h, glkstart.h, and Make.glkloader in the include directory.
14		14
15	GLKNAME = glkloader	15	GLKNAME = glkloader
16	GLKINCLUDEDIR = /usr/local/include/glk/	16	GLKINCLUDEDIR = /usr/include/glk/
17	GLKLIBDIR = /usr/local/lib/	17	GLKLIBDIR = /usr/lib/
18		18
19	# Pick a C compiler.	19	# Pick a C compiler.
20	#CC = cc	20	#CC = cc
Lines 22-31 Link Here
22	LINK = gcc	22	LINK = gcc
23	INSTALL = install -g 0 -o 0	23	INSTALL = install -g 0 -o 0
24		24
25	OPTIONS = -g -Wall -fPIC -DLINUX	25	OPTIONS = -Wall -fPIC -DLINUX
26	INCLUDEDIRS = -I$(GLKINCLUDEDIR)	26	INCLUDEDIRS = -I$(GLKINCLUDEDIR) -I.
27		27
28	CFLAGS = $(OPTIONS) $(INCLUDEDIRS)	28	CFLAGS += $(OPTIONS) $(INCLUDEDIRS)
29	LDFLAGS = -rdynamic	29	LDFLAGS = -rdynamic
30	LIBDIRS =	30	LIBDIRS =
31	LIBS = -ldl	31	LIBS = -ldl
Lines 45-59 Link Here
45		45
46	all: $(GLKLIBSTATIC) $(GLKLIBSHARED) $(GLKMAKEFILE)	46	all: $(GLKLIBSTATIC) $(GLKLIBSHARED) $(GLKMAKEFILE)
47		47
48	$(GLKLIBSTATIC): $(OBJS)	48	$(GLKLIBSTATIC): $(OBJS) xpconfig/libxpconfig.la
49	cd xpconfig && ./internal-build-script
50	ar r $(GLKLIBSTATIC) $(OBJS)	49	ar r $(GLKLIBSTATIC) $(OBJS)
51	ranlib $(GLKLIBSTATIC)	50	ranlib $(GLKLIBSTATIC)
52		51
53	$(GLKLIBSHARED): $(OBJS)	52	$(GLKLIBSHARED): $(OBJS) xpconfig/libxpconfig.la
54	cd xpconfig && ./internal-build-script
55	$(LINK) $(LDFLAGS) -shared -Wl,-soname,$(GLKLIBSHARED).$(MAJOR) -o $(GLKLIBSHARED).$(MAJOR).$(MINOR).$(MICRO) $(OBJS) $(LIBDIRS) $(LIBS) $(XPCONFIG)	53	$(LINK) $(LDFLAGS) -shared -Wl,-soname,$(GLKLIBSHARED).$(MAJOR) -o $(GLKLIBSHARED).$(MAJOR).$(MINOR).$(MICRO) $(OBJS) $(LIBDIRS) $(LIBS) $(XPCONFIG)
56		54
		55	xpconfig/libxpconfig.la:
		56	cd xpconfig && ./internal-build-script
		57
57	$(GLKMAKEFILE):	58	$(GLKMAKEFILE):
58	echo LINKLIBS = $(LIBDIRS) $(LIBS) > $(GLKMAKEFILE)	59	echo LINKLIBS = $(LIBDIRS) $(LIBS) > $(GLKMAKEFILE)
59	echo GLKLIB = -l$(GLKNAME) >> $(GLKMAKEFILE)	60	echo GLKLIB = -l$(GLKNAME) >> $(GLKMAKEFILE)
Lines 72-78 Link Here
72	ln -s -f $(GLKLIBDIR)/$(GLKLIBSHARED).$(MAJOR).$(MINOR).$(MICRO) $(GLKLIBDIR)/$(GLKLIBSHARED).$(MAJOR).$(MINOR)	72	ln -s -f $(GLKLIBDIR)/$(GLKLIBSHARED).$(MAJOR).$(MINOR).$(MICRO) $(GLKLIBDIR)/$(GLKLIBSHARED).$(MAJOR).$(MINOR)
73	ln -s -f $(GLKLIBDIR)/$(GLKLIBSHARED).$(MAJOR).$(MINOR).$(MICRO) $(GLKLIBDIR)/$(GLKLIBSHARED).$(MAJOR)	73	ln -s -f $(GLKLIBDIR)/$(GLKLIBSHARED).$(MAJOR).$(MINOR).$(MICRO) $(GLKLIBDIR)/$(GLKLIBSHARED).$(MAJOR)
74	ln -s -f $(GLKLIBDIR)/$(GLKLIBSHARED).$(MAJOR).$(MINOR).$(MICRO) $(GLKLIBDIR)/$(GLKLIBSHARED)	74	ln -s -f $(GLKLIBDIR)/$(GLKLIBSHARED).$(MAJOR).$(MINOR).$(MICRO) $(GLKLIBDIR)/$(GLKLIBSHARED)
75	ldconfig
76		75
77	uninstall:	76	uninstall:
78	rm -f $(GLKINCLUDEDIR)/$(GLKMAKEFILE)	77	rm -f $(GLKINCLUDEDIR)/$(GLKMAKEFILE)