From cb40ace9219832a27ed1451bf2603654045b576c Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 21 Sep 2007 20:17:58 +0000 Subject: [PATCH] - Make all doc files UTF-8 --- sdljava-0.9.1-regen.patch | 24 ++++++++++++------------ sdljava.spec | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/sdljava-0.9.1-regen.patch b/sdljava-0.9.1-regen.patch index 36b832f..90aa6e5 100644 --- a/sdljava-0.9.1-regen.patch +++ b/sdljava-0.9.1-regen.patch @@ -44,34 +44,34 @@ diff -up sdljava-0.9.1/etc/build/linux/Makefile.regen sdljava-0.9.1/etc/build/li -#SDLVideo_wrap.c: SDLVideo.i common.i -# $(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLVideo.i +SDLAudio_wrap.c: SDLAudio.i common.i -+ $(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLAudio.i ++ $(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLAudio.i + +SDLCdrom_wrap.c: SDLCdrom.i common.i -+ $(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLCdrom.i ++ $(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLCdrom.i + +SDLEvent_wrap.c: SDLEvent.i common.i -+ $(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLEvent.i ++ $(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLEvent.i + +SDLGFX_wrap.c: SDLGFX.i common.i -+ $(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLGFX.i ++ $(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLGFX.i + +SDLImage_wrap.c: SDLImage.i common.i -+ $(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLImage.i ++ $(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLImage.i + +SDLJoystick_wrap.c: SDLJoystick.i common.i -+ $(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLJoystick.i ++ $(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLJoystick.i + +SDLMain_wrap.c: SDLMain.i common.i -+ $(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMain.i ++ $(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMain.i + +SDLMixer_wrap.c: SDLMixer.i common.i -+ $(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMixer.i ++ $(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMixer.i + +SDLTTF_wrap.c: SDLTTF.i common.i -+ $(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLTTF.i ++ $(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLTTF.i + +SDLVideo_wrap.c: SDLVideo.i common.i -+ $(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLVideo.i ++ $(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLVideo.i %.o: %.c $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ @@ -100,7 +100,7 @@ diff -up sdljava-0.9.1/etc/build/gljava/linux/Makefile.regen sdljava-0.9.1/etc/b -#glew_wrap.c: glew.i gljava_common_typemaps.i opengl-1_1.i -# $(SWIG) $(INCLUDE) -importall -java -package org.gljava.opengl.x.swig -outdir ../../../../org/gljava/opengl/x/swig glew.i +glew_wrap.c: glew.i gljava_common_typemaps.i opengl-1_1.i -+ $(SWIG) $(INCLUDE) -importall -java -package org.gljava.opengl.x.swig -outdir ../../../../org/gljava/opengl/x/swig glew.i ++ $(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package org.gljava.opengl.x.swig -outdir ../../../../org/gljava/opengl/x/swig glew.i %.o: %.c $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ @@ -124,7 +124,7 @@ diff -up sdljava-0.9.1/etc/build/gljava/linux/ftgl/Makefile.regen sdljava-0.9.1/ -# $(SWIG) -Wall -c++ $(INCLUDE) -importall -java -package org.gljava.opengl.ftgl -outdir ../../../../../org/gljava/opengl/ftgl FTGL.i -# ./post-process.rb +FTGL_wrap.cxx: FTGL.i FTFont.i FTFace.i FTGLBitmapFont.i FTGLExtrdFont.i FTGLOutlineFont.i FTGLPixmapFont.i FTGLPolygonFont.i FTGLTextureFont.i -+ $(SWIG) -Wall -c++ $(INCLUDE) -importall -java -package org.gljava.opengl.ftgl -outdir ../../../../../org/gljava/opengl/ftgl FTGL.i ++ $(SWIG) -Wall -c++ $(INCLUDE) $(ARCH_DEFINE) -importall -java -package org.gljava.opengl.ftgl -outdir ../../../../../org/gljava/opengl/ftgl FTGL.i + ./post-process.rb %.o: %.cxx diff --git a/sdljava.spec b/sdljava.spec index f3759b3..60063f8 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -89,12 +89,12 @@ rm src/org/gljava/opengl/native/glew_wrap.c %build # ugly workaround for swig not defining __powerpc[64]__ when parsing on ppc[64] -# -D__STRICT_ANSI__ works around swig barfing on bits/stdlib-ldbl.h +# -D__LONG_DOUBLE_128__ works around swig barfing on bits/stdlib-ldbl.h %ifarch ppc -export ARCH_DEFINE="-D__powerpc__ -D__STRICT_ANSI__" +export ARCH_DEFINE="-D__powerpc__ -D__LONG_DOUBLE_128__" %endif %ifarch ppc64 -export ARCH_DEFINE="-D__powerpc64__ -D__STRICT_ANSI__" +export ARCH_DEFINE="-D__powerpc64__ -D__LONG_DOUBLE_128__" %endif pushd src/sdljava/native