mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
some -lm fixes for Allegro-4.3.10, moved -lm fixes to allegro-4.3.10-lm.diff from allegro-4.3.10-haiku-4.diff, added prelim support to build jpgaleg on haiku
This commit is contained in:
Scott McCreary
@@ -1,6 +1,6 @@
|
||||
diff -urN allegro-4.3.10/addons/allegrogl/fix.sh allegro-4.3.10-haiku/addons/allegrogl/fix.sh
|
||||
--- allegro-4.3.10/addons/allegrogl/fix.sh 2008-01-01 03:20:16.000000000 -0800
|
||||
+++ allegro-4.3.10-haiku/addons/allegrogl/fix.sh 2008-09-12 07:32:18.000000000 -0700
|
||||
--- allegro-4.3.10/addons/allegrogl/fix.sh 2008-01-01 11:20:16.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/addons/allegrogl/fix.sh 2008-09-13 20:09:02.000000000 +0000
|
||||
@@ -18,7 +18,7 @@
|
||||
echo "Compilation target adjustment."
|
||||
echo " Usage: fix <platform> [--dtou|--utod|--quick]"
|
||||
@@ -18,82 +18,20 @@ diff -urN allegro-4.3.10/addons/allegrogl/fix.sh allegro-4.3.10-haiku/addons/all
|
||||
mingw ) proc_fix "Mingw32" "makefile.mgw";;
|
||||
mingw32 ) proc_fix "Mingw32" "makefile.mgw";;
|
||||
# used only by allegro's zipup.sh in packaging process
|
||||
diff -urN allegro-4.3.10/addons/jpgalleg/makefile.be allegro-4.3.10-haiku/addons/jpgalleg/makefile.be
|
||||
--- allegro-4.3.10/addons/jpgalleg/makefile.be 2008-01-01 13:59:18.000000000 -0800
|
||||
+++ allegro-4.3.10-haiku/addons/jpgalleg/makefile.be 2008-09-12 07:45:54.000000000 -0700
|
||||
@@ -38,7 +38,7 @@
|
||||
endif
|
||||
endif
|
||||
|
||||
-LIBS = -lm `../../allegro-config --libs --addon`
|
||||
+LIBS = `../../allegro-config --libs --addon`
|
||||
LDFLAGS = -L../../lib/$(PLATFORM_PATH)
|
||||
INSTALL_LIB_PATH = /boot/develop/lib/x86
|
||||
INSTALL_HEADER_PATH = /boot/develop/headers
|
||||
diff -urN allegro-4.3.10/addons/loadpng/Makefile.be allegro-4.3.10-haiku/addons/loadpng/Makefile.be
|
||||
--- allegro-4.3.10/addons/loadpng/Makefile.be 1969-12-31 16:00:00.000000000 -0800
|
||||
+++ allegro-4.3.10-haiku/addons/loadpng/Makefile.be 2008-09-12 07:32:18.000000000 -0700
|
||||
@@ -0,0 +1,57 @@
|
||||
+## Aux -*- Makefile -*- for BeOS/Haiku
|
||||
+
|
||||
+prefix := `/boot/common/bin/allegro-config --prefix`
|
||||
+libdir := $(prefix)/lib
|
||||
+includedir := $(prefix)/include
|
||||
+DESTDIR :=
|
||||
+
|
||||
+EXAMPLECFLAGS := -Wno-deprecated-declarations -I/boot/common/include
|
||||
+EXAMPLELIBS := -lpng -lz `/boot/common/bin/allegro-config --libs --addon` -L/boot/common/lib
|
||||
+
|
||||
+
|
||||
+#--------------------------------------------------
|
||||
+# Note: this is for gcc
|
||||
+# And I don't really think you should use it, but it's up to you
|
||||
+.PHONY: shared
|
||||
+
|
||||
+SHAREDLIB := libloadpng-$(VERSION).so
|
||||
+
|
||||
+shared: $(SHAREDLIB)
|
||||
+
|
||||
+$(SHAREDLIB): loadpng.c savepng.c regpng.c
|
||||
+ $(CC) -o $(SHAREDLIB) $(CFLAGS) -fPIC -shared loadpng.c savepng.c regpng.c
|
||||
+
|
||||
+#--------------------------------------------------
|
||||
+.PHONY: install install-headers install-shared
|
||||
+
|
||||
+install: $(LIB) install-headers
|
||||
+ install -d -m 755 $(DESTDIR)$(libdir)
|
||||
+ install -m 644 $(LIB) $(DESTDIR)$(libdir)
|
||||
+ @echo -
|
||||
+ @echo loadpng is now installed.
|
||||
+
|
||||
+install-shared: $(SHAREDLIB) install-headers
|
||||
+ install -d -m 755 $(DESTDIR)$(libdir)
|
||||
+ install -m 755 $(SHAREDLIB) $(DESTDIR)$(libdir)
|
||||
+
|
||||
+install-headers:
|
||||
+ install -d -m 755 $(DESTDIR)$(includedir)
|
||||
+ install -m 644 loadpng.h $(DESTDIR)$(includedir)
|
||||
+
|
||||
+#--------------------------------------------------
|
||||
+.PHONY: uninstall
|
||||
+
|
||||
+uninstall:
|
||||
+ -rm -f $(DESTDIR)$(includedir)/loadpng.h
|
||||
+ -rm -f $(DESTDIR)$(libdir)/$(LIB)
|
||||
+ @echo -
|
||||
+ @echo loadpng is now uninstalled.
|
||||
+
|
||||
+#--------------------------------------------------
|
||||
+.PHONY: clean veryclean
|
||||
+
|
||||
+clean:
|
||||
+ - rm -f loadpng.o savepng.o regpng.o $(LIB) $(SHAREDLIB)
|
||||
+
|
||||
+veryclean: clean
|
||||
+ - rm -f $(EXAMPLES) examples/saved.png
|
||||
diff -urN allegro-4.3.10/addons/jpgalleg/fix.sh allegro-4.3.10-haiku/addons/jpgalleg/fix.sh
|
||||
--- allegro-4.3.10/addons/jpgalleg/fix.sh 2008-01-04 19:55:22.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/addons/jpgalleg/fix.sh 2008-09-13 18:13:30.000000000 +0000
|
||||
@@ -94,6 +94,7 @@
|
||||
"mingw" ) proc_fix "MinGW32" "makefile.mgw";;
|
||||
"msvc" ) proc_fix "MSVC" "makefile.vc";;
|
||||
"beos" ) proc_fix "BeOS" "makefile.be";;
|
||||
+ "haiku" ) proc_fix "Haiku" "makefile.be";;
|
||||
"unix" ) proc_fix "Unix" "makefile.uni";;
|
||||
"macosx" ) proc_fix "MacOS X" "makefile.osx";;
|
||||
"help" ) proc_help;;
|
||||
diff -urN allegro-4.3.10/addons/loadpng/fix.sh allegro-4.3.10-haiku/addons/loadpng/fix.sh
|
||||
--- allegro-4.3.10/addons/loadpng/fix.sh 2007-12-27 17:05:30.000000000 -0800
|
||||
+++ allegro-4.3.10-haiku/addons/loadpng/fix.sh 2008-09-12 07:32:18.000000000 -0700
|
||||
--- allegro-4.3.10/addons/loadpng/fix.sh 2007-12-28 01:05:30.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/addons/loadpng/fix.sh 2008-09-13 20:09:10.000000000 +0000
|
||||
@@ -8,7 +8,7 @@
|
||||
echo
|
||||
echo "Usage: $0 <platform> [--quick|--dtou|--utod]"
|
||||
@@ -113,56 +51,9 @@ diff -urN allegro-4.3.10/addons/loadpng/fix.sh allegro-4.3.10-haiku/addons/loadp
|
||||
"mingw" ) proc_fix "Windows (MinGW)" "Makefile.mgw";;
|
||||
"mingw32" ) proc_fix "Windows (MinGW)" "Makefile.mgw";;
|
||||
"unix" ) proc_fix "Unix" "Makefile.unx";;
|
||||
diff -urN allegro-4.3.10/addons/logg/Makefile.be allegro-4.3.10-haiku/addons/logg/Makefile.be
|
||||
--- allegro-4.3.10/addons/logg/Makefile.be 1969-12-31 16:00:00.000000000 -0800
|
||||
+++ allegro-4.3.10-haiku/addons/logg/Makefile.be 2008-09-12 07:32:18.000000000 -0700
|
||||
@@ -0,0 +1,43 @@
|
||||
+PREFIX=`/boot/common/bin/allegro-config --prefix`
|
||||
+CC=gcc
|
||||
+FLAGS=-O2 -g0 `/boot/common/bin/allegro-config --cflags --addon` -I/boot/common/include
|
||||
+LFLAGS=-L. -L/boot/common/lib -llogg -logg -lvorbis -lvorbisfile `/boot/common/bin/allegro-config --libs --addon`
|
||||
+
|
||||
+all: lib play_ogg stream_ogg
|
||||
+
|
||||
+lib: liblogg.a
|
||||
+
|
||||
+liblogg.a: logg.o
|
||||
+ ar rc $@ $^
|
||||
+ ranlib $@
|
||||
+
|
||||
+logg.o: logg.c logg.h
|
||||
+ $(CC) $(FLAGS) -c logg.c
|
||||
+
|
||||
+play_ogg: play_ogg.c liblogg.a
|
||||
+ gcc $(FLAGS) play_ogg.c -o play_ogg $(LFLAGS)
|
||||
+
|
||||
+stream_ogg: stream_ogg.c liblogg.a
|
||||
+ gcc $(FLAGS) stream_ogg.c -o stream_ogg $(LFLAGS)
|
||||
+
|
||||
+clean:
|
||||
+ rm -f logg.o
|
||||
+
|
||||
+veryclean: clean
|
||||
+ rm -f liblogg.a
|
||||
+ rm -f play_ogg
|
||||
+ rm -f stream_ogg
|
||||
+
|
||||
+install:
|
||||
+ cp -f logg.h $(DESTDIR)$(PREFIX)/include
|
||||
+ cp -f liblogg.a $(DESTDIR)$(PREFIX)/lib
|
||||
+ @echo -
|
||||
+ @echo logg is now installed.
|
||||
+
|
||||
+uninstall:
|
||||
+ rm -f $(DESTDIR)$(PREFIX)/include/logg.h
|
||||
+ rm -f $(DESTDIR)$(PREFIX)/lib/liblogg.a
|
||||
+ @echo -
|
||||
+ @echo logg is now uninstalled.
|
||||
+
|
||||
+examples: play_ogg stream_ogg
|
||||
diff -urN allegro-4.3.10/addons/logg/fix.sh allegro-4.3.10-haiku/addons/logg/fix.sh
|
||||
--- allegro-4.3.10/addons/logg/fix.sh 2007-12-31 11:24:16.000000000 -0800
|
||||
+++ allegro-4.3.10-haiku/addons/logg/fix.sh 2008-09-12 07:32:18.000000000 -0700
|
||||
--- allegro-4.3.10/addons/logg/fix.sh 2007-12-31 19:24:16.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/addons/logg/fix.sh 2008-09-13 20:11:46.000000000 +0000
|
||||
@@ -8,7 +8,7 @@
|
||||
echo
|
||||
echo "Usage: $0 <platform> [--quick|--dtou|--utod]"
|
||||
@@ -182,8 +73,8 @@ diff -urN allegro-4.3.10/addons/logg/fix.sh allegro-4.3.10-haiku/addons/logg/fix
|
||||
"mingw32" ) proc_fix "Windows (MinGW)" "Makefile.migw";;
|
||||
"unix" ) proc_fix "Unix" "Makefile.unix";;
|
||||
diff -urN allegro-4.3.10/fix.sh allegro-4.3.10-haiku/fix.sh
|
||||
--- allegro-4.3.10/fix.sh 2008-01-01 13:59:18.000000000 -0800
|
||||
+++ allegro-4.3.10-haiku/fix.sh 2008-09-12 07:32:18.000000000 -0700
|
||||
--- allegro-4.3.10/fix.sh 2008-01-01 21:59:18.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/fix.sh 2008-09-13 20:11:46.000000000 +0000
|
||||
@@ -9,7 +9,7 @@
|
||||
echo
|
||||
echo "Usage: $0 <platform> [--quick|--dtou|--utod|--utom|--mtou]"
|
||||
@@ -202,8 +93,8 @@ diff -urN allegro-4.3.10/fix.sh allegro-4.3.10-haiku/fix.sh
|
||||
"mingw32" ) proc_fix "Windows (MinGW)" "makefile.mgw" "ALLEGRO_MINGW32";;
|
||||
# The 'msvc' target is undocumented in the help message, but is used
|
||||
diff -urN allegro-4.3.10/include/allegro/internal/aintern.h allegro-4.3.10-haiku/include/allegro/internal/aintern.h
|
||||
--- allegro-4.3.10/include/allegro/internal/aintern.h 2008-01-05 14:37:14.000000000 -0800
|
||||
+++ allegro-4.3.10-haiku/include/allegro/internal/aintern.h 2008-09-12 07:32:18.000000000 -0700
|
||||
--- allegro-4.3.10/include/allegro/internal/aintern.h 2008-01-05 22:37:14.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/include/allegro/internal/aintern.h 2008-09-13 20:11:46.000000000 +0000
|
||||
@@ -189,7 +189,7 @@
|
||||
|
||||
|
||||
@@ -214,8 +105,8 @@ diff -urN allegro-4.3.10/include/allegro/internal/aintern.h allegro-4.3.10-haiku
|
||||
AL_ARRAY(char *, _pckeys_names);
|
||||
|
||||
diff -urN allegro-4.3.10/include/allegro/internal/alconfig.h allegro-4.3.10-haiku/include/allegro/internal/alconfig.h
|
||||
--- allegro-4.3.10/include/allegro/internal/alconfig.h 2007-06-24 01:13:22.000000000 -0700
|
||||
+++ allegro-4.3.10-haiku/include/allegro/internal/alconfig.h 2008-09-12 07:32:18.000000000 -0700
|
||||
--- allegro-4.3.10/include/allegro/internal/alconfig.h 2007-06-24 08:13:22.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/include/allegro/internal/alconfig.h 2008-09-13 20:11:46.000000000 +0000
|
||||
@@ -48,6 +48,8 @@
|
||||
#include "allegro/platform/albcc32.h"
|
||||
#elif defined ALLEGRO_MSVC
|
||||
@@ -226,8 +117,8 @@ diff -urN allegro-4.3.10/include/allegro/internal/alconfig.h allegro-4.3.10-haik
|
||||
#include "allegro/platform/albecfg.h"
|
||||
#elif defined ALLEGRO_MPW
|
||||
diff -urN allegro-4.3.10/include/allegro/platform/albecfg.h allegro-4.3.10-haiku/include/allegro/platform/albecfg.h
|
||||
--- allegro-4.3.10/include/allegro/platform/albecfg.h 2007-06-15 19:52:28.000000000 -0700
|
||||
+++ allegro-4.3.10-haiku/include/allegro/platform/albecfg.h 2008-09-12 06:58:19.000000000 -0700
|
||||
--- allegro-4.3.10/include/allegro/platform/albecfg.h 2007-06-16 02:52:28.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/include/allegro/platform/albecfg.h 2008-09-13 20:11:46.000000000 +0000
|
||||
@@ -31,7 +31,13 @@
|
||||
#define ALLEGRO_HAVE_SYS_TIME_H 1
|
||||
|
||||
@@ -244,8 +135,8 @@ diff -urN allegro-4.3.10/include/allegro/platform/albecfg.h allegro-4.3.10-haiku
|
||||
#define ALLEGRO_CONSOLE_OK
|
||||
#define ALLEGRO_USE_CONSTRUCTOR
|
||||
diff -urN allegro-4.3.10/include/allegro/platform/albeos.h allegro-4.3.10-haiku/include/allegro/platform/albeos.h
|
||||
--- allegro-4.3.10/include/allegro/platform/albeos.h 2002-10-01 11:05:12.000000000 -0700
|
||||
+++ allegro-4.3.10-haiku/include/allegro/platform/albeos.h 2008-09-12 07:10:56.000000000 -0700
|
||||
--- allegro-4.3.10/include/allegro/platform/albeos.h 2002-10-01 18:05:12.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/include/allegro/platform/albeos.h 2008-09-13 20:11:46.000000000 +0000
|
||||
@@ -74,3 +74,7 @@
|
||||
#define JOYSTICK_DRIVER_BEOS \
|
||||
{ JOYSTICK_BEOS, &joystick_beos, TRUE },
|
||||
@@ -255,8 +146,8 @@ diff -urN allegro-4.3.10/include/allegro/platform/albeos.h allegro-4.3.10-haiku/
|
||||
+#endif
|
||||
+
|
||||
diff -urN allegro-4.3.10/include/allegro/platform/alunixac.hin allegro-4.3.10-haiku/include/allegro/platform/alunixac.hin
|
||||
--- allegro-4.3.10/include/allegro/platform/alunixac.hin 2007-07-14 22:28:14.000000000 -0700
|
||||
+++ allegro-4.3.10-haiku/include/allegro/platform/alunixac.hin 2008-09-12 07:32:18.000000000 -0700
|
||||
--- allegro-4.3.10/include/allegro/platform/alunixac.hin 2007-07-15 05:28:14.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/include/allegro/platform/alunixac.hin 2008-09-13 20:11:46.000000000 +0000
|
||||
@@ -68,7 +68,7 @@
|
||||
#undef ALLEGRO_DARWIN
|
||||
|
||||
@@ -276,8 +167,8 @@ diff -urN allegro-4.3.10/include/allegro/platform/alunixac.hin allegro-4.3.10-ha
|
||||
/* Define to empty if `const' does not conform to ANSI C. */
|
||||
#undef const
|
||||
diff -urN allegro-4.3.10/include/allegro/system.h allegro-4.3.10-haiku/include/allegro/system.h
|
||||
--- allegro-4.3.10/include/allegro/system.h 2008-01-02 02:39:24.000000000 -0800
|
||||
+++ allegro-4.3.10-haiku/include/allegro/system.h 2008-09-12 07:32:18.000000000 -0700
|
||||
--- allegro-4.3.10/include/allegro/system.h 2008-01-02 10:39:24.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/include/allegro/system.h 2008-09-13 20:11:46.000000000 +0000
|
||||
@@ -61,6 +61,7 @@
|
||||
#define OSTYPE_QNX AL_ID('Q','N','X',' ')
|
||||
#define OSTYPE_UNIX AL_ID('U','N','I','X')
|
||||
@@ -287,8 +178,8 @@ diff -urN allegro-4.3.10/include/allegro/system.h allegro-4.3.10-haiku/include/a
|
||||
#define OSTYPE_MACOSX AL_ID('M','A','C','X')
|
||||
|
||||
diff -urN allegro-4.3.10/makefile.all allegro-4.3.10-haiku/makefile.all
|
||||
--- allegro-4.3.10/makefile.all 2008-01-14 03:55:28.000000000 -0800
|
||||
+++ allegro-4.3.10-haiku/makefile.all 2008-09-12 07:32:18.000000000 -0700
|
||||
--- allegro-4.3.10/makefile.all 2008-01-14 11:55:28.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/makefile.all 2008-09-13 20:11:46.000000000 +0000
|
||||
@@ -8,7 +8,7 @@
|
||||
# DEBUGMODE=2 selects a build intended to debug Allegro itself.
|
||||
# PROFILEMODE=1 selects a profiling build.
|
||||
@@ -308,8 +199,8 @@ diff -urN allegro-4.3.10/makefile.all allegro-4.3.10-haiku/makefile.all
|
||||
|
||||
DOCS = $(addprefix docs/txt/,$(addsuffix .txt,$(filter-out changes thanks readme, $(DOCBASEFILES))))
|
||||
diff -urN allegro-4.3.10/makefile.be allegro-4.3.10-haiku/makefile.be
|
||||
--- allegro-4.3.10/makefile.be 2008-01-11 03:30:16.000000000 -0800
|
||||
+++ allegro-4.3.10-haiku/makefile.be 2008-09-12 07:32:18.000000000 -0700
|
||||
--- allegro-4.3.10/makefile.be 2008-01-11 11:30:16.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/makefile.be 2008-09-13 20:11:46.000000000 +0000
|
||||
@@ -10,7 +10,15 @@
|
||||
|
||||
# -------- define some variables that the primary makefile will use --------
|
||||
@@ -356,8 +247,8 @@ diff -urN allegro-4.3.10/makefile.be allegro-4.3.10-haiku/makefile.be
|
||||
chmod a+x /bin/allegro-config
|
||||
|
||||
diff -urN allegro-4.3.10/misc/mkunixdists.sh allegro-4.3.10-haiku/misc/mkunixdists.sh
|
||||
--- allegro-4.3.10/misc/mkunixdists.sh 2008-01-10 13:45:48.000000000 -0800
|
||||
+++ allegro-4.3.10-haiku/misc/mkunixdists.sh 2008-09-12 07:32:18.000000000 -0700
|
||||
--- allegro-4.3.10/misc/mkunixdists.sh 2008-01-10 21:45:48.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/misc/mkunixdists.sh 2008-09-13 20:11:46.000000000 +0000
|
||||
@@ -73,9 +73,9 @@
|
||||
# Hack'n'slash
|
||||
echo "Stripping to form end-user distribution"
|
||||
@@ -383,8 +274,8 @@ diff -urN allegro-4.3.10/misc/mkunixdists.sh allegro-4.3.10-haiku/misc/mkunixdis
|
||||
# logg addon
|
||||
(cd addons/logg && rm -f Makefile.mingw play_ogg.c stream_ogg.c fix.bat)
|
||||
diff -urN allegro-4.3.10/misc/zipup.sh allegro-4.3.10-haiku/misc/zipup.sh
|
||||
--- allegro-4.3.10/misc/zipup.sh 2008-01-19 04:16:56.000000000 -0800
|
||||
+++ allegro-4.3.10-haiku/misc/zipup.sh 2008-09-12 07:32:18.000000000 -0700
|
||||
--- allegro-4.3.10/misc/zipup.sh 2008-01-19 12:16:56.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/misc/zipup.sh 2008-09-13 20:11:46.000000000 +0000
|
||||
@@ -125,6 +125,12 @@
|
||||
|
||||
make depend UNIX_TOOLS=1 CC=gcc
|
||||
@@ -408,8 +299,8 @@ diff -urN allegro-4.3.10/misc/zipup.sh allegro-4.3.10-haiku/misc/zipup.sh
|
||||
done
|
||||
|
||||
diff -urN allegro-4.3.10/setup/keyconf.c allegro-4.3.10-haiku/setup/keyconf.c
|
||||
--- allegro-4.3.10/setup/keyconf.c 2005-04-07 16:37:20.000000000 -0700
|
||||
+++ allegro-4.3.10-haiku/setup/keyconf.c 2008-09-12 07:32:18.000000000 -0700
|
||||
--- allegro-4.3.10/setup/keyconf.c 2005-04-07 23:37:20.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/setup/keyconf.c 2008-09-13 20:11:46.000000000 +0000
|
||||
@@ -25,8 +25,8 @@
|
||||
|
||||
|
||||
@@ -422,8 +313,8 @@ diff -urN allegro-4.3.10/setup/keyconf.c allegro-4.3.10-haiku/setup/keyconf.c
|
||||
|
||||
char *ascii_name[32] =
|
||||
diff -urN allegro-4.3.10/src/beos/baccel.cpp allegro-4.3.10-haiku/src/beos/baccel.cpp
|
||||
--- allegro-4.3.10/src/beos/baccel.cpp 2002-09-01 16:18:56.000000000 -0700
|
||||
+++ allegro-4.3.10-haiku/src/beos/baccel.cpp 2008-09-12 07:32:18.000000000 -0700
|
||||
--- allegro-4.3.10/src/beos/baccel.cpp 2002-09-01 23:18:56.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/src/beos/baccel.cpp 2008-09-13 20:11:46.000000000 +0000
|
||||
@@ -20,7 +20,7 @@
|
||||
#include "allegro/internal/aintern.h"
|
||||
#include "allegro/platform/aintbeos.h"
|
||||
@@ -434,8 +325,8 @@ diff -urN allegro-4.3.10/src/beos/baccel.cpp allegro-4.3.10-haiku/src/beos/bacce
|
||||
#endif
|
||||
|
||||
diff -urN allegro-4.3.10/src/beos/bdispsw.cpp allegro-4.3.10-haiku/src/beos/bdispsw.cpp
|
||||
--- allegro-4.3.10/src/beos/bdispsw.cpp 2002-04-06 07:18:16.000000000 -0800
|
||||
+++ allegro-4.3.10-haiku/src/beos/bdispsw.cpp 2008-09-12 07:32:19.000000000 -0700
|
||||
--- allegro-4.3.10/src/beos/bdispsw.cpp 2002-04-06 15:18:16.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/src/beos/bdispsw.cpp 2008-09-13 20:11:46.000000000 +0000
|
||||
@@ -19,7 +19,7 @@
|
||||
#include "allegro/internal/aintern.h"
|
||||
#include "allegro/platform/aintbeos.h"
|
||||
@@ -446,8 +337,8 @@ diff -urN allegro-4.3.10/src/beos/bdispsw.cpp allegro-4.3.10-haiku/src/beos/bdis
|
||||
#endif
|
||||
|
||||
diff -urN allegro-4.3.10/src/beos/bdwindow.cpp allegro-4.3.10-haiku/src/beos/bdwindow.cpp
|
||||
--- allegro-4.3.10/src/beos/bdwindow.cpp 2005-10-27 13:57:00.000000000 -0700
|
||||
+++ allegro-4.3.10-haiku/src/beos/bdwindow.cpp 2008-09-12 07:32:19.000000000 -0700
|
||||
--- allegro-4.3.10/src/beos/bdwindow.cpp 2005-10-27 20:57:00.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/src/beos/bdwindow.cpp 2008-09-13 20:11:46.000000000 +0000
|
||||
@@ -21,7 +21,7 @@
|
||||
#include "allegro/internal/aintern.h"
|
||||
#include "allegro/platform/aintbeos.h"
|
||||
@@ -458,8 +349,8 @@ diff -urN allegro-4.3.10/src/beos/bdwindow.cpp allegro-4.3.10-haiku/src/beos/bdw
|
||||
#endif
|
||||
|
||||
diff -urN allegro-4.3.10/src/beos/bgfx.c allegro-4.3.10-haiku/src/beos/bgfx.c
|
||||
--- allegro-4.3.10/src/beos/bgfx.c 2004-11-26 08:05:12.000000000 -0800
|
||||
+++ allegro-4.3.10-haiku/src/beos/bgfx.c 2008-09-12 07:32:19.000000000 -0700
|
||||
--- allegro-4.3.10/src/beos/bgfx.c 2004-11-26 16:05:12.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/src/beos/bgfx.c 2008-09-13 20:11:46.000000000 +0000
|
||||
@@ -19,9 +19,9 @@
|
||||
#include "allegro/internal/aintern.h"
|
||||
#include "allegro/platform/aintbeos.h"
|
||||
@@ -473,8 +364,8 @@ diff -urN allegro-4.3.10/src/beos/bgfx.c allegro-4.3.10-haiku/src/beos/bgfx.c
|
||||
|
||||
|
||||
diff -urN allegro-4.3.10/src/beos/bgfxapi.cpp allegro-4.3.10-haiku/src/beos/bgfxapi.cpp
|
||||
--- allegro-4.3.10/src/beos/bgfxapi.cpp 2002-12-07 13:12:30.000000000 -0800
|
||||
+++ allegro-4.3.10-haiku/src/beos/bgfxapi.cpp 2008-09-12 07:32:19.000000000 -0700
|
||||
--- allegro-4.3.10/src/beos/bgfxapi.cpp 2002-12-07 21:12:30.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/src/beos/bgfxapi.cpp 2008-09-13 20:11:46.000000000 +0000
|
||||
@@ -19,7 +19,7 @@
|
||||
#include "allegro/internal/aintern.h"
|
||||
#include "allegro/platform/aintbeos.h"
|
||||
@@ -485,8 +376,8 @@ diff -urN allegro-4.3.10/src/beos/bgfxapi.cpp allegro-4.3.10-haiku/src/beos/bgfx
|
||||
#endif
|
||||
|
||||
diff -urN allegro-4.3.10/src/beos/bgfxdrv.c allegro-4.3.10-haiku/src/beos/bgfxdrv.c
|
||||
--- allegro-4.3.10/src/beos/bgfxdrv.c 2001-11-06 07:30:48.000000000 -0800
|
||||
+++ allegro-4.3.10-haiku/src/beos/bgfxdrv.c 2008-09-12 07:32:19.000000000 -0700
|
||||
--- allegro-4.3.10/src/beos/bgfxdrv.c 2001-11-06 15:30:48.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/src/beos/bgfxdrv.c 2008-09-13 20:11:46.000000000 +0000
|
||||
@@ -18,9 +18,9 @@
|
||||
#include "allegro.h"
|
||||
#include "allegro/internal/aintern.h"
|
||||
@@ -500,8 +391,8 @@ diff -urN allegro-4.3.10/src/beos/bgfxdrv.c allegro-4.3.10-haiku/src/beos/bgfxdr
|
||||
BEGIN_GFX_DRIVER_LIST
|
||||
GFX_DRIVER_BEOS
|
||||
diff -urN allegro-4.3.10/src/beos/bjoy.c allegro-4.3.10-haiku/src/beos/bjoy.c
|
||||
--- allegro-4.3.10/src/beos/bjoy.c 2001-11-06 09:16:42.000000000 -0800
|
||||
+++ allegro-4.3.10-haiku/src/beos/bjoy.c 2008-09-12 07:32:19.000000000 -0700
|
||||
--- allegro-4.3.10/src/beos/bjoy.c 2001-11-06 17:16:42.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/src/beos/bjoy.c 2008-09-13 20:11:46.000000000 +0000
|
||||
@@ -19,7 +19,7 @@
|
||||
#include "allegro/internal/aintern.h"
|
||||
#include "allegro/platform/aintbeos.h"
|
||||
@@ -512,8 +403,8 @@ diff -urN allegro-4.3.10/src/beos/bjoy.c allegro-4.3.10-haiku/src/beos/bjoy.c
|
||||
#endif
|
||||
|
||||
diff -urN allegro-4.3.10/src/beos/bjoyapi.cpp allegro-4.3.10-haiku/src/beos/bjoyapi.cpp
|
||||
--- allegro-4.3.10/src/beos/bjoyapi.cpp 2004-07-04 07:44:50.000000000 -0700
|
||||
+++ allegro-4.3.10-haiku/src/beos/bjoyapi.cpp 2008-09-12 07:32:19.000000000 -0700
|
||||
--- allegro-4.3.10/src/beos/bjoyapi.cpp 2004-07-04 14:44:50.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/src/beos/bjoyapi.cpp 2008-09-13 20:11:46.000000000 +0000
|
||||
@@ -19,9 +19,9 @@
|
||||
#include "allegro/internal/aintern.h"
|
||||
#include "allegro/platform/aintbeos.h"
|
||||
@@ -527,8 +418,8 @@ diff -urN allegro-4.3.10/src/beos/bjoyapi.cpp allegro-4.3.10-haiku/src/beos/bjoy
|
||||
static BJoystick *be_joy = NULL;
|
||||
static int32 num_devices, num_axes, num_hats, num_buttons;
|
||||
diff -urN allegro-4.3.10/src/beos/bjoydrv.c allegro-4.3.10-haiku/src/beos/bjoydrv.c
|
||||
--- allegro-4.3.10/src/beos/bjoydrv.c 2001-11-06 07:30:48.000000000 -0800
|
||||
+++ allegro-4.3.10-haiku/src/beos/bjoydrv.c 2008-09-12 07:32:19.000000000 -0700
|
||||
--- allegro-4.3.10/src/beos/bjoydrv.c 2001-11-06 15:30:48.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/src/beos/bjoydrv.c 2008-09-13 20:11:46.000000000 +0000
|
||||
@@ -18,9 +18,9 @@
|
||||
#include "allegro.h"
|
||||
#include "allegro/internal/aintern.h"
|
||||
@@ -542,8 +433,8 @@ diff -urN allegro-4.3.10/src/beos/bjoydrv.c allegro-4.3.10-haiku/src/beos/bjoydr
|
||||
BEGIN_JOYSTICK_DRIVER_LIST
|
||||
JOYSTICK_DRIVER_BEOS
|
||||
diff -urN allegro-4.3.10/src/beos/bkey.c allegro-4.3.10-haiku/src/beos/bkey.c
|
||||
--- allegro-4.3.10/src/beos/bkey.c 2004-12-03 12:56:28.000000000 -0800
|
||||
+++ allegro-4.3.10-haiku/src/beos/bkey.c 2008-09-12 07:32:19.000000000 -0700
|
||||
--- allegro-4.3.10/src/beos/bkey.c 2004-12-03 20:56:28.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/src/beos/bkey.c 2008-09-13 20:11:46.000000000 +0000
|
||||
@@ -19,9 +19,9 @@
|
||||
#include "allegro/internal/aintern.h"
|
||||
#include "allegro/platform/aintbeos.h"
|
||||
@@ -557,8 +448,8 @@ diff -urN allegro-4.3.10/src/beos/bkey.c allegro-4.3.10-haiku/src/beos/bkey.c
|
||||
|
||||
|
||||
diff -urN allegro-4.3.10/src/beos/bkeyapi.cpp allegro-4.3.10-haiku/src/beos/bkeyapi.cpp
|
||||
--- allegro-4.3.10/src/beos/bkeyapi.cpp 2005-10-27 13:57:00.000000000 -0700
|
||||
+++ allegro-4.3.10-haiku/src/beos/bkeyapi.cpp 2008-09-12 07:32:19.000000000 -0700
|
||||
--- allegro-4.3.10/src/beos/bkeyapi.cpp 2005-10-27 20:57:00.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/src/beos/bkeyapi.cpp 2008-09-13 20:11:46.000000000 +0000
|
||||
@@ -22,9 +22,9 @@
|
||||
#include "allegro/internal/aintern.h"
|
||||
#include "allegro/platform/aintbeos.h"
|
||||
@@ -572,8 +463,8 @@ diff -urN allegro-4.3.10/src/beos/bkeyapi.cpp allegro-4.3.10-haiku/src/beos/bkey
|
||||
#define KEY_ID_PC101 0 // the docs say it should be 0x83ab, but they lie
|
||||
|
||||
diff -urN allegro-4.3.10/src/beos/bkeydrv.c allegro-4.3.10-haiku/src/beos/bkeydrv.c
|
||||
--- allegro-4.3.10/src/beos/bkeydrv.c 2001-11-06 07:30:48.000000000 -0800
|
||||
+++ allegro-4.3.10-haiku/src/beos/bkeydrv.c 2008-09-12 07:32:19.000000000 -0700
|
||||
--- allegro-4.3.10/src/beos/bkeydrv.c 2001-11-06 15:30:48.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/src/beos/bkeydrv.c 2008-09-13 20:11:46.000000000 +0000
|
||||
@@ -18,9 +18,9 @@
|
||||
#include "allegro.h"
|
||||
#include "allegro/internal/aintern.h"
|
||||
@@ -587,8 +478,8 @@ diff -urN allegro-4.3.10/src/beos/bkeydrv.c allegro-4.3.10-haiku/src/beos/bkeydr
|
||||
_DRIVER_INFO _keyboard_driver_list[] =
|
||||
{
|
||||
diff -urN allegro-4.3.10/src/beos/bmidi.c allegro-4.3.10-haiku/src/beos/bmidi.c
|
||||
--- allegro-4.3.10/src/beos/bmidi.c 2006-03-18 07:05:34.000000000 -0800
|
||||
+++ allegro-4.3.10-haiku/src/beos/bmidi.c 2008-09-12 07:32:19.000000000 -0700
|
||||
--- allegro-4.3.10/src/beos/bmidi.c 2006-03-18 15:05:34.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/src/beos/bmidi.c 2008-09-13 20:11:46.000000000 +0000
|
||||
@@ -19,9 +19,9 @@
|
||||
#include "allegro/internal/aintern.h"
|
||||
#include "allegro/platform/aintbeos.h"
|
||||
@@ -602,8 +493,8 @@ diff -urN allegro-4.3.10/src/beos/bmidi.c allegro-4.3.10-haiku/src/beos/bmidi.c
|
||||
MIDI_DRIVER midi_beos =
|
||||
{
|
||||
diff -urN allegro-4.3.10/src/beos/bmidiapi.cpp allegro-4.3.10-haiku/src/beos/bmidiapi.cpp
|
||||
--- allegro-4.3.10/src/beos/bmidiapi.cpp 2007-08-09 14:48:38.000000000 -0700
|
||||
+++ allegro-4.3.10-haiku/src/beos/bmidiapi.cpp 2008-09-12 07:32:19.000000000 -0700
|
||||
--- allegro-4.3.10/src/beos/bmidiapi.cpp 2007-08-09 21:48:38.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/src/beos/bmidiapi.cpp 2008-09-13 20:11:46.000000000 +0000
|
||||
@@ -19,9 +19,9 @@
|
||||
#include "allegro/internal/aintern.h"
|
||||
#include "allegro/platform/aintbeos.h"
|
||||
@@ -617,8 +508,8 @@ diff -urN allegro-4.3.10/src/beos/bmidiapi.cpp allegro-4.3.10-haiku/src/beos/bmi
|
||||
|
||||
BMidiSynth *_be_midisynth = NULL;
|
||||
diff -urN allegro-4.3.10/src/beos/bmididrv.c allegro-4.3.10-haiku/src/beos/bmididrv.c
|
||||
--- allegro-4.3.10/src/beos/bmididrv.c 2001-11-06 07:30:48.000000000 -0800
|
||||
+++ allegro-4.3.10-haiku/src/beos/bmididrv.c 2008-09-12 07:32:19.000000000 -0700
|
||||
--- allegro-4.3.10/src/beos/bmididrv.c 2001-11-06 15:30:48.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/src/beos/bmididrv.c 2008-09-13 20:11:46.000000000 +0000
|
||||
@@ -18,9 +18,9 @@
|
||||
#include "allegro.h"
|
||||
#include "allegro/internal/aintern.h"
|
||||
@@ -632,8 +523,8 @@ diff -urN allegro-4.3.10/src/beos/bmididrv.c allegro-4.3.10-haiku/src/beos/bmidi
|
||||
BEGIN_MIDI_DRIVER_LIST
|
||||
MIDI_DRIVER_BEOS
|
||||
diff -urN allegro-4.3.10/src/beos/bmousapi.cpp allegro-4.3.10-haiku/src/beos/bmousapi.cpp
|
||||
--- allegro-4.3.10/src/beos/bmousapi.cpp 2005-10-27 13:57:00.000000000 -0700
|
||||
+++ allegro-4.3.10-haiku/src/beos/bmousapi.cpp 2008-09-12 07:32:19.000000000 -0700
|
||||
--- allegro-4.3.10/src/beos/bmousapi.cpp 2005-10-27 20:57:00.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/src/beos/bmousapi.cpp 2008-09-13 20:11:46.000000000 +0000
|
||||
@@ -23,9 +23,9 @@
|
||||
#include "allegro/internal/aintern.h"
|
||||
#include "allegro/platform/aintbeos.h"
|
||||
@@ -647,8 +538,8 @@ diff -urN allegro-4.3.10/src/beos/bmousapi.cpp allegro-4.3.10-haiku/src/beos/bmo
|
||||
#define MOUSE_THREAD_NAME "mouse driver"
|
||||
#define MOUSE_THREAD_PRIORITY 60
|
||||
diff -urN allegro-4.3.10/src/beos/bmousdrv.c allegro-4.3.10-haiku/src/beos/bmousdrv.c
|
||||
--- allegro-4.3.10/src/beos/bmousdrv.c 2001-11-06 07:30:48.000000000 -0800
|
||||
+++ allegro-4.3.10-haiku/src/beos/bmousdrv.c 2008-09-12 07:32:19.000000000 -0700
|
||||
--- allegro-4.3.10/src/beos/bmousdrv.c 2001-11-06 15:30:48.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/src/beos/bmousdrv.c 2008-09-13 20:11:46.000000000 +0000
|
||||
@@ -18,9 +18,9 @@
|
||||
#include "allegro.h"
|
||||
#include "allegro/internal/aintern.h"
|
||||
@@ -662,8 +553,8 @@ diff -urN allegro-4.3.10/src/beos/bmousdrv.c allegro-4.3.10-haiku/src/beos/bmous
|
||||
|
||||
|
||||
diff -urN allegro-4.3.10/src/beos/bmouse.c allegro-4.3.10-haiku/src/beos/bmouse.c
|
||||
--- allegro-4.3.10/src/beos/bmouse.c 2004-12-04 05:24:16.000000000 -0800
|
||||
+++ allegro-4.3.10-haiku/src/beos/bmouse.c 2008-09-12 07:32:19.000000000 -0700
|
||||
--- allegro-4.3.10/src/beos/bmouse.c 2004-12-04 13:24:16.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/src/beos/bmouse.c 2008-09-13 20:11:46.000000000 +0000
|
||||
@@ -19,9 +19,9 @@
|
||||
#include "allegro/internal/aintern.h"
|
||||
#include "allegro/platform/aintbeos.h"
|
||||
@@ -677,8 +568,8 @@ diff -urN allegro-4.3.10/src/beos/bmouse.c allegro-4.3.10-haiku/src/beos/bmouse.
|
||||
|
||||
|
||||
diff -urN allegro-4.3.10/src/beos/boverlay.cpp allegro-4.3.10-haiku/src/beos/boverlay.cpp
|
||||
--- allegro-4.3.10/src/beos/boverlay.cpp 2002-11-15 03:53:40.000000000 -0800
|
||||
+++ allegro-4.3.10-haiku/src/beos/boverlay.cpp 2008-09-12 07:32:19.000000000 -0700
|
||||
--- allegro-4.3.10/src/beos/boverlay.cpp 2002-11-15 11:53:40.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/src/beos/boverlay.cpp 2008-09-13 20:11:46.000000000 +0000
|
||||
@@ -19,7 +19,7 @@
|
||||
#include "allegro/internal/aintern.h"
|
||||
#include "allegro/platform/aintbeos.h"
|
||||
@@ -689,8 +580,8 @@ diff -urN allegro-4.3.10/src/beos/boverlay.cpp allegro-4.3.10-haiku/src/beos/bov
|
||||
#endif
|
||||
|
||||
diff -urN allegro-4.3.10/src/beos/bsnd.c allegro-4.3.10-haiku/src/beos/bsnd.c
|
||||
--- allegro-4.3.10/src/beos/bsnd.c 2006-03-18 07:05:34.000000000 -0800
|
||||
+++ allegro-4.3.10-haiku/src/beos/bsnd.c 2008-09-12 07:32:19.000000000 -0700
|
||||
--- allegro-4.3.10/src/beos/bsnd.c 2006-03-18 15:05:34.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/src/beos/bsnd.c 2008-09-13 20:11:47.000000000 +0000
|
||||
@@ -19,9 +19,9 @@
|
||||
#include "allegro/internal/aintern.h"
|
||||
#include "allegro/platform/aintbeos.h"
|
||||
@@ -704,8 +595,8 @@ diff -urN allegro-4.3.10/src/beos/bsnd.c allegro-4.3.10-haiku/src/beos/bsnd.c
|
||||
DIGI_DRIVER digi_beos =
|
||||
{
|
||||
diff -urN allegro-4.3.10/src/beos/bsndapi.cpp allegro-4.3.10-haiku/src/beos/bsndapi.cpp
|
||||
--- allegro-4.3.10/src/beos/bsndapi.cpp 2006-03-18 07:05:34.000000000 -0800
|
||||
+++ allegro-4.3.10-haiku/src/beos/bsndapi.cpp 2008-09-12 07:32:19.000000000 -0700
|
||||
--- allegro-4.3.10/src/beos/bsndapi.cpp 2006-03-18 15:05:34.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/src/beos/bsndapi.cpp 2008-09-13 20:11:47.000000000 +0000
|
||||
@@ -20,7 +20,7 @@
|
||||
#include "allegro/internal/aintern.h"
|
||||
#include "allegro/platform/aintbeos.h"
|
||||
@@ -716,8 +607,8 @@ diff -urN allegro-4.3.10/src/beos/bsndapi.cpp allegro-4.3.10-haiku/src/beos/bsnd
|
||||
#endif
|
||||
|
||||
diff -urN allegro-4.3.10/src/beos/bsnddrv.c allegro-4.3.10-haiku/src/beos/bsnddrv.c
|
||||
--- allegro-4.3.10/src/beos/bsnddrv.c 2001-11-06 07:30:48.000000000 -0800
|
||||
+++ allegro-4.3.10-haiku/src/beos/bsnddrv.c 2008-09-12 07:32:19.000000000 -0700
|
||||
--- allegro-4.3.10/src/beos/bsnddrv.c 2001-11-06 15:30:48.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/src/beos/bsnddrv.c 2008-09-13 20:11:47.000000000 +0000
|
||||
@@ -19,9 +19,9 @@
|
||||
#include "allegro/internal/aintern.h"
|
||||
|
||||
@@ -731,8 +622,8 @@ diff -urN allegro-4.3.10/src/beos/bsnddrv.c allegro-4.3.10-haiku/src/beos/bsnddr
|
||||
BEGIN_DIGI_DRIVER_LIST
|
||||
DIGI_DRIVER_BEOS
|
||||
diff -urN allegro-4.3.10/src/beos/bsysapi.cpp allegro-4.3.10-haiku/src/beos/bsysapi.cpp
|
||||
--- allegro-4.3.10/src/beos/bsysapi.cpp 2005-10-27 13:57:00.000000000 -0700
|
||||
+++ allegro-4.3.10-haiku/src/beos/bsysapi.cpp 2008-09-12 07:32:19.000000000 -0700
|
||||
--- allegro-4.3.10/src/beos/bsysapi.cpp 2005-10-27 20:57:00.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/src/beos/bsysapi.cpp 2008-09-13 20:11:47.000000000 +0000
|
||||
@@ -27,9 +27,9 @@
|
||||
#include <sys/utsname.h>
|
||||
#endif
|
||||
@@ -746,8 +637,8 @@ diff -urN allegro-4.3.10/src/beos/bsysapi.cpp allegro-4.3.10-haiku/src/beos/bsys
|
||||
#define SYS_THREAD_PRIORITY B_NORMAL_PRIORITY
|
||||
#define SYS_THREAD_NAME "system driver"
|
||||
diff -urN allegro-4.3.10/src/beos/bsysdrv.c allegro-4.3.10-haiku/src/beos/bsysdrv.c
|
||||
--- allegro-4.3.10/src/beos/bsysdrv.c 2001-11-06 07:30:48.000000000 -0800
|
||||
+++ allegro-4.3.10-haiku/src/beos/bsysdrv.c 2008-09-12 07:32:19.000000000 -0700
|
||||
--- allegro-4.3.10/src/beos/bsysdrv.c 2001-11-06 15:30:48.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/src/beos/bsysdrv.c 2008-09-13 20:11:47.000000000 +0000
|
||||
@@ -18,9 +18,9 @@
|
||||
#include "allegro.h"
|
||||
#include "allegro/internal/aintern.h"
|
||||
@@ -761,8 +652,8 @@ diff -urN allegro-4.3.10/src/beos/bsysdrv.c allegro-4.3.10-haiku/src/beos/bsysdr
|
||||
_DRIVER_INFO _system_driver_list[] =
|
||||
{
|
||||
diff -urN allegro-4.3.10/src/beos/bsystem.c allegro-4.3.10-haiku/src/beos/bsystem.c
|
||||
--- allegro-4.3.10/src/beos/bsystem.c 2002-12-07 13:10:58.000000000 -0800
|
||||
+++ allegro-4.3.10-haiku/src/beos/bsystem.c 2008-09-12 07:32:19.000000000 -0700
|
||||
--- allegro-4.3.10/src/beos/bsystem.c 2002-12-07 21:10:58.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/src/beos/bsystem.c 2008-09-13 20:11:47.000000000 +0000
|
||||
@@ -19,11 +19,9 @@
|
||||
#include "allegro/internal/aintern.h"
|
||||
#include "allegro/platform/aintbeos.h"
|
||||
@@ -778,8 +669,8 @@ diff -urN allegro-4.3.10/src/beos/bsystem.c allegro-4.3.10-haiku/src/beos/bsyste
|
||||
SYSTEM_DRIVER system_beos = {
|
||||
SYSTEM_BEOS,
|
||||
diff -urN allegro-4.3.10/src/beos/btimeapi.cpp allegro-4.3.10-haiku/src/beos/btimeapi.cpp
|
||||
--- allegro-4.3.10/src/beos/btimeapi.cpp 2004-07-27 04:33:22.000000000 -0700
|
||||
+++ allegro-4.3.10-haiku/src/beos/btimeapi.cpp 2008-09-12 07:32:19.000000000 -0700
|
||||
--- allegro-4.3.10/src/beos/btimeapi.cpp 2004-07-27 11:33:22.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/src/beos/btimeapi.cpp 2008-09-13 20:11:47.000000000 +0000
|
||||
@@ -19,7 +19,7 @@
|
||||
#include "allegro/internal/aintern.h"
|
||||
#include "allegro/platform/aintbeos.h"
|
||||
@@ -790,8 +681,8 @@ diff -urN allegro-4.3.10/src/beos/btimeapi.cpp allegro-4.3.10-haiku/src/beos/bti
|
||||
#endif
|
||||
|
||||
diff -urN allegro-4.3.10/src/beos/btimedrv.c allegro-4.3.10-haiku/src/beos/btimedrv.c
|
||||
--- allegro-4.3.10/src/beos/btimedrv.c 2001-11-06 07:30:48.000000000 -0800
|
||||
+++ allegro-4.3.10-haiku/src/beos/btimedrv.c 2008-09-12 07:32:19.000000000 -0700
|
||||
--- allegro-4.3.10/src/beos/btimedrv.c 2001-11-06 15:30:48.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/src/beos/btimedrv.c 2008-09-13 20:11:47.000000000 +0000
|
||||
@@ -18,9 +18,9 @@
|
||||
#include "allegro.h"
|
||||
#include "allegro/internal/aintern.h"
|
||||
@@ -805,8 +696,8 @@ diff -urN allegro-4.3.10/src/beos/btimedrv.c allegro-4.3.10-haiku/src/beos/btime
|
||||
_DRIVER_INFO _timer_driver_list[] = {
|
||||
{TIMER_BEOS, &timer_beos, TRUE},
|
||||
diff -urN allegro-4.3.10/src/beos/btimer.c allegro-4.3.10-haiku/src/beos/btimer.c
|
||||
--- allegro-4.3.10/src/beos/btimer.c 2004-08-21 19:57:14.000000000 -0700
|
||||
+++ allegro-4.3.10-haiku/src/beos/btimer.c 2008-09-12 07:32:19.000000000 -0700
|
||||
--- allegro-4.3.10/src/beos/btimer.c 2004-08-22 02:57:14.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/src/beos/btimer.c 2008-09-13 20:11:47.000000000 +0000
|
||||
@@ -19,7 +19,7 @@
|
||||
#include "allegro/internal/aintern.h"
|
||||
#include "allegro/platform/aintbeos.h"
|
||||
@@ -817,8 +708,8 @@ diff -urN allegro-4.3.10/src/beos/btimer.c allegro-4.3.10-haiku/src/beos/btimer.
|
||||
#endif
|
||||
|
||||
diff -urN allegro-4.3.10/src/beos/bwindow.cpp allegro-4.3.10-haiku/src/beos/bwindow.cpp
|
||||
--- allegro-4.3.10/src/beos/bwindow.cpp 2002-11-15 03:53:40.000000000 -0800
|
||||
+++ allegro-4.3.10-haiku/src/beos/bwindow.cpp 2008-09-12 07:32:19.000000000 -0700
|
||||
--- allegro-4.3.10/src/beos/bwindow.cpp 2002-11-15 11:53:40.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/src/beos/bwindow.cpp 2008-09-13 20:11:47.000000000 +0000
|
||||
@@ -19,7 +19,7 @@
|
||||
#include "allegro/internal/aintern.h"
|
||||
#include "allegro/platform/aintbeos.h"
|
||||
@@ -829,8 +720,8 @@ diff -urN allegro-4.3.10/src/beos/bwindow.cpp allegro-4.3.10-haiku/src/beos/bwin
|
||||
#endif
|
||||
|
||||
diff -urN allegro-4.3.10/src/beos/bwscreen.cpp allegro-4.3.10-haiku/src/beos/bwscreen.cpp
|
||||
--- allegro-4.3.10/src/beos/bwscreen.cpp 2004-11-26 09:27:02.000000000 -0800
|
||||
+++ allegro-4.3.10-haiku/src/beos/bwscreen.cpp 2008-09-12 07:32:19.000000000 -0700
|
||||
--- allegro-4.3.10/src/beos/bwscreen.cpp 2004-11-26 17:27:02.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/src/beos/bwscreen.cpp 2008-09-13 20:11:47.000000000 +0000
|
||||
@@ -19,7 +19,7 @@
|
||||
#include "allegro/internal/aintern.h"
|
||||
#include "allegro/platform/aintbeos.h"
|
||||
@@ -841,8 +732,8 @@ diff -urN allegro-4.3.10/src/beos/bwscreen.cpp allegro-4.3.10-haiku/src/beos/bws
|
||||
#endif
|
||||
|
||||
diff -urN allegro-4.3.10/src/i386/asmdefs.inc allegro-4.3.10-haiku/src/i386/asmdefs.inc
|
||||
--- allegro-4.3.10/src/i386/asmdefs.inc 2007-06-15 19:52:28.000000000 -0700
|
||||
+++ allegro-4.3.10-haiku/src/i386/asmdefs.inc 2008-09-12 07:32:19.000000000 -0700
|
||||
--- allegro-4.3.10/src/i386/asmdefs.inc 2007-06-16 02:52:28.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/src/i386/asmdefs.inc 2008-09-13 20:11:47.000000000 +0000
|
||||
@@ -31,6 +31,8 @@
|
||||
#include "obj/msvc/asmdef.inc"
|
||||
#elif defined ALLEGRO_WATCOM
|
||||
@@ -853,8 +744,8 @@ diff -urN allegro-4.3.10/src/i386/asmdefs.inc allegro-4.3.10-haiku/src/i386/asmd
|
||||
#include "obj/beos/asmdef.inc"
|
||||
#elif defined ALLEGRO_QNX
|
||||
diff -urN allegro-4.3.10/src/midi.c allegro-4.3.10-haiku/src/midi.c
|
||||
--- allegro-4.3.10/src/midi.c 2007-04-12 09:19:54.000000000 -0700
|
||||
+++ allegro-4.3.10-haiku/src/midi.c 2008-09-12 07:32:19.000000000 -0700
|
||||
--- allegro-4.3.10/src/midi.c 2007-04-12 16:19:54.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/src/midi.c 2008-09-13 20:11:47.000000000 +0000
|
||||
@@ -1122,7 +1122,7 @@
|
||||
running_status = 0;
|
||||
|
||||
@@ -865,8 +756,8 @@ diff -urN allegro-4.3.10/src/midi.c allegro-4.3.10-haiku/src/midi.c
|
||||
{ int i; for (i=1; i; i--); }
|
||||
#endif
|
||||
diff -urN allegro-4.3.10/tools/dat2c.c allegro-4.3.10-haiku/tools/dat2c.c
|
||||
--- allegro-4.3.10/tools/dat2c.c 2005-04-28 02:53:38.000000000 -0700
|
||||
+++ allegro-4.3.10-haiku/tools/dat2c.c 2008-09-12 07:32:19.000000000 -0700
|
||||
--- allegro-4.3.10/tools/dat2c.c 2005-04-28 09:53:38.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/tools/dat2c.c 2008-09-13 20:11:47.000000000 +0000
|
||||
@@ -342,7 +342,7 @@
|
||||
}
|
||||
|
||||
@@ -877,8 +768,8 @@ diff -urN allegro-4.3.10/tools/dat2c.c allegro-4.3.10-haiku/tools/dat2c.c
|
||||
#elif (defined ALLEGRO_WINDOWS || defined ALLEGRO_DOS)
|
||||
dat2c->lformat = lineformat_dos;
|
||||
diff -urN allegro-4.3.10/tools/datedit.c allegro-4.3.10-haiku/tools/datedit.c
|
||||
--- allegro-4.3.10/tools/datedit.c 2007-10-08 09:23:36.000000000 -0700
|
||||
+++ allegro-4.3.10-haiku/tools/datedit.c 2008-09-12 07:32:19.000000000 -0700
|
||||
--- allegro-4.3.10/tools/datedit.c 2007-10-08 16:23:36.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/tools/datedit.c 2008-09-13 20:11:47.000000000 +0000
|
||||
@@ -121,6 +121,8 @@
|
||||
#include "obj/dmc/plugins.h"
|
||||
#elif defined ALLEGRO_BEOS
|
||||
@@ -889,8 +780,8 @@ diff -urN allegro-4.3.10/tools/datedit.c allegro-4.3.10-haiku/tools/datedit.c
|
||||
#include "obj/bcc32/plugins.h"
|
||||
#elif defined ALLEGRO_MPW
|
||||
diff -urN allegro-4.3.10/tools/grabber.c allegro-4.3.10-haiku/tools/grabber.c
|
||||
--- allegro-4.3.10/tools/grabber.c 2006-07-24 06:09:26.000000000 -0700
|
||||
+++ allegro-4.3.10-haiku/tools/grabber.c 2008-09-12 07:32:19.000000000 -0700
|
||||
--- allegro-4.3.10/tools/grabber.c 2006-07-24 13:09:26.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/tools/grabber.c 2008-09-13 20:11:48.000000000 +0000
|
||||
@@ -3132,6 +3132,7 @@
|
||||
case OSTYPE_QNX: s = "QNX"; break;
|
||||
case OSTYPE_UNIX: s = "Unix"; break;
|
||||
|
||||
190
media-libs/allegro/allegro-4.3.10-lm.diff
Normal file
190
media-libs/allegro/allegro-4.3.10-lm.diff
Normal file
@@ -0,0 +1,190 @@
|
||||
diff -urN allegro-4.3.10/addons/allegrogl/configure allegro-4.3.10-haiku/addons/allegrogl/configure
|
||||
--- allegro-4.3.10/addons/allegrogl/configure 2008-01-19 23:57:16.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/addons/allegrogl/configure 2008-09-13 19:57:44.000000000 +0000
|
||||
@@ -3624,6 +3624,70 @@
|
||||
LIBS="-lpthread $LIBS"
|
||||
fi
|
||||
|
||||
+{ echo "$as_me:$LINENO: checking for cos in -lm" >&5
|
||||
+echo $ECHO_N "checking for cos in -lm... $ECHO_C" >&6; }
|
||||
+if test "${ac_cv_lib_m_cos+set}" = set; then
|
||||
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
+else
|
||||
+ ac_check_lib_save_LIBS=$LIBS
|
||||
+LIBS="-lm $LIBS"
|
||||
+cat >conftest.$ac_ext <<_ACEOF
|
||||
+/* confdefs.h. */
|
||||
+_ACEOF
|
||||
+cat confdefs.h >>conftest.$ac_ext
|
||||
+cat >>conftest.$ac_ext <<_ACEOF
|
||||
+/* end confdefs.h. */
|
||||
+
|
||||
+/* Override any GCC internal prototype to avoid an error.
|
||||
+ Use char because int might match the return type of a GCC
|
||||
+ builtin and then its argument prototype would still apply. */
|
||||
+#ifdef __cplusplus
|
||||
+extern "C"
|
||||
+#endif
|
||||
+char cos ();
|
||||
+int
|
||||
+main ()
|
||||
+{
|
||||
+return cos ();
|
||||
+ ;
|
||||
+ return 0;
|
||||
+}
|
||||
+_ACEOF
|
||||
+rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
+if { (ac_try="$ac_link"
|
||||
+case "(($ac_try" in
|
||||
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
+ *) ac_try_echo=$ac_try;;
|
||||
+esac
|
||||
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||
+ (eval "$ac_link") 2>conftest.er1
|
||||
+ ac_status=$?
|
||||
+ grep -v '^ *+' conftest.er1 >conftest.err
|
||||
+ rm -f conftest.er1
|
||||
+ cat conftest.err >&5
|
||||
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
+ (exit $ac_status); } && {
|
||||
+ test -z "$ac_c_werror_flag" ||
|
||||
+ test ! -s conftest.err
|
||||
+ } && test -s conftest$ac_exeext &&
|
||||
+ $as_test_x conftest$ac_exeext; then
|
||||
+ ac_cv_lib_m_cos=yes
|
||||
+else
|
||||
+ echo "$as_me: failed program was:" >&5
|
||||
+sed 's/^/| /' conftest.$ac_ext >&5
|
||||
+
|
||||
+ ac_cv_lib_m_cos=no
|
||||
+fi
|
||||
+
|
||||
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
||||
+ conftest$ac_exeext conftest.$ac_ext
|
||||
+LIBS=$ac_check_lib_save_LIBS
|
||||
+fi
|
||||
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_cos" >&5
|
||||
+echo "${ECHO_T}$ac_cv_lib_m_cos" >&6; }
|
||||
+if test $ac_cv_lib_m_cos = yes; then
|
||||
+ LIBS="-lm $LIBS"
|
||||
+fi
|
||||
|
||||
|
||||
if test -n "$agl_build_generic"; then
|
||||
@@ -4247,7 +4311,7 @@
|
||||
if test -n "$x_libraries"; then
|
||||
LDFLAGS="-L$x_libraries $LDFLAGS"
|
||||
fi
|
||||
- LIBS="-lXext -lX11 -lm $LIBS"
|
||||
+ LIBS="-lXext -lX11 $LIBS"
|
||||
|
||||
|
||||
if test -n "$agl_enable_xf86vidmode"; then
|
||||
diff -urN allegro-4.3.10/addons/allegrogl/configure.in allegro-4.3.10-haiku/addons/allegrogl/configure.in
|
||||
--- allegro-4.3.10/addons/allegrogl/configure.in 2008-01-01 11:20:16.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/addons/allegrogl/configure.in 2008-09-13 19:56:10.000000000 +0000
|
||||
@@ -54,7 +54,7 @@
|
||||
dnl Check for pthread support, which GL libs may require (e.g. FreeBSD)
|
||||
AC_CHECK_HEADER(pthread.h, , dontcare=y)
|
||||
AC_CHECK_LIB(pthread, pthread_create, LIBS="-lpthread $LIBS")
|
||||
-
|
||||
+AC_CHECK_LIB(m, cos, LIBS="-lm $LIBS")
|
||||
|
||||
dnl Build Mesa generic driver
|
||||
if test -n "$agl_build_generic"; then
|
||||
@@ -76,7 +76,7 @@
|
||||
if test -n "$x_libraries"; then
|
||||
LDFLAGS="-L$x_libraries $LDFLAGS"
|
||||
fi
|
||||
- LIBS="-lXext -lX11 -lm $LIBS"
|
||||
+ LIBS="-lXext -lX11 $LIBS"
|
||||
|
||||
|
||||
dnl Test for VidMode extension
|
||||
|
||||
diff -urN allegro-4.3.10/addons/jpgalleg/makefile.be allegro-4.3.10-haiku/addons/jpgalleg/makefile.be
|
||||
--- allegro-4.3.10/addons/jpgalleg/makefile.be 2008-01-01 21:59:18.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/addons/jpgalleg/makefile.be 2008-09-13 20:09:02.000000000 +0000
|
||||
@@ -38,7 +38,7 @@
|
||||
endif
|
||||
endif
|
||||
|
||||
-LIBS = -lm `../../allegro-config --libs --addon`
|
||||
+LIBS = `../../allegro-config --libs --addon`
|
||||
LDFLAGS = -L../../lib/$(PLATFORM_PATH)
|
||||
INSTALL_LIB_PATH = /boot/develop/lib/x86
|
||||
INSTALL_HEADER_PATH = /boot/develop/headers
|
||||
diff -urN allegro-4.3.10/configure allegro-4.3.10-haiku/configure
|
||||
--- allegro-4.3.10/configure 2008-01-19 23:57:12.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/configure 2008-09-13 19:53:14.000000000 +0000
|
||||
@@ -5436,6 +5436,14 @@
|
||||
allegro_build_normal_library=yes
|
||||
_programs="release"
|
||||
fi
|
||||
+
|
||||
+M_LIBS="-lm"
|
||||
+case "$host_os" in
|
||||
+ beos* | haiku*)
|
||||
+ M_LIBS=""
|
||||
+ ;;
|
||||
+esac
|
||||
+
|
||||
if test "X$allegro_build_static_programs" = "Xyes"; then
|
||||
LIBALLEG=lib/unix/lib$LIB_TO_LINK.a
|
||||
LINK_LIBALLEG="$LIBALLEG \$(LIBS)"
|
||||
@@ -5444,7 +5452,7 @@
|
||||
_programs="statically linked $_programs"
|
||||
else
|
||||
LIBALLEG="lib/unix/lib${LIB_TO_LINK}-\$(shared_version).so lib/unix/lib${LIB_TO_LINK}_unsharable.a"
|
||||
- LINK_LIBALLEG="-Llib/unix -l${LIB_TO_LINK}-\$(shared_version) -l${LIB_TO_LINK}_unsharable -lm"
|
||||
+ LINK_LIBALLEG="-Llib/unix -l${LIB_TO_LINK}-\$(shared_version) -l${LIB_TO_LINK}_unsharable $(M_LIBS)"
|
||||
LINK_WITH_STATIC_LIBS=no
|
||||
allegro_shared_libraries=yes
|
||||
_programs="dynamically linked $_programs"
|
||||
@@ -11167,7 +11175,7 @@
|
||||
|
||||
#-----------------------------------------------------------------------------#
|
||||
|
||||
-LIBS="-lm $LIBS"
|
||||
+LIBS="$(M_LIBS) $LIBS"
|
||||
|
||||
case "$allegro_system" in
|
||||
|
||||
diff -urN allegro-4.3.10/configure.in allegro-4.3.10-haiku/configure.in
|
||||
--- allegro-4.3.10/configure.in 2008-01-03 20:47:10.000000000 +0000
|
||||
+++ allegro-4.3.10-haiku/configure.in 2008-09-13 19:52:03.000000000 +0000
|
||||
@@ -298,6 +298,15 @@
|
||||
allegro_build_normal_library=yes
|
||||
_programs="release"
|
||||
fi
|
||||
+
|
||||
+M_LIBS="-lm"
|
||||
+case "$host_os" in
|
||||
+ beos* | haiku*)
|
||||
+ M_LIBS=""
|
||||
+ ;;
|
||||
+esac
|
||||
+
|
||||
+
|
||||
if test "X$allegro_build_static_programs" = "Xyes"; then
|
||||
LIBALLEG=lib/unix/lib$LIB_TO_LINK.a
|
||||
LINK_LIBALLEG="$LIBALLEG \$(LIBS)"
|
||||
@@ -306,7 +315,7 @@
|
||||
_programs="statically linked $_programs"
|
||||
else
|
||||
LIBALLEG="lib/unix/lib${LIB_TO_LINK}-\$(shared_version).so lib/unix/lib${LIB_TO_LINK}_unsharable.a"
|
||||
- LINK_LIBALLEG="-Llib/unix -l${LIB_TO_LINK}-\$(shared_version) -l${LIB_TO_LINK}_unsharable -lm"
|
||||
+ LINK_LIBALLEG="-Llib/unix -l${LIB_TO_LINK}-\$(shared_version) -l${LIB_TO_LINK}_unsharable $(M_LIBS)"
|
||||
LINK_WITH_STATIC_LIBS=no
|
||||
allegro_shared_libraries=yes
|
||||
_programs="dynamically linked $_programs"
|
||||
@@ -873,7 +882,7 @@
|
||||
#-----------------------------------------------------------------------------#
|
||||
|
||||
dnl Additional libraries.
|
||||
-LIBS="-lm $LIBS"
|
||||
+LIBS="$(M_LIBS) $LIBS"
|
||||
|
||||
case "$allegro_system" in
|
||||
|
||||
Reference in New Issue
Block a user