| [AD] include path fixup patch. |
[ Thread Index |
Date Index
| More lists.liballeg.org/allegro-developers Archives
]
I've got a patch to fix up a ton of references to include/allegro in 4.9 that
are now incorrect.
Apply if you will, otherwise I can.
sourceforge sucks. can't even compress patches ::)
--
Thomas Fjellstrom
tfjellstrom@xxxxxxxxxx
Index: makefile.dmc
===================================================================
--- makefile.dmc (revision 9797)
+++ makefile.dmc (working copy)
@@ -205,12 +205,12 @@
copy lib\dmc\$(DLL_BASENAME) $(WINDIR_D)
HEADERS = $(DMCDIR_U)/include/winalleg.h \
- $(DMCDIR_U)/include/allegro/platform/aintwin.h \
- $(DMCDIR_U)/include/allegro/platform/al386gcc.h \
- $(DMCDIR_U)/include/allegro/platform/aldmc.h \
- $(DMCDIR_U)/include/allegro/platform/alplatf.h \
- $(DMCDIR_U)/include/allegro/platform/astdint.h \
- $(DMCDIR_U)/include/allegro/platform/alwin.h
+ $(DMCDIR_U)/include/allegro5/platform/aintwin.h \
+ $(DMCDIR_U)/include/allegro5/platform/al386gcc.h \
+ $(DMCDIR_U)/include/allegro5/platform/aldmc.h \
+ $(DMCDIR_U)/include/allegro5/platform/alplatf.h \
+ $(DMCDIR_U)/include/allegro5/platform/astdint.h \
+ $(DMCDIR_U)/include/allegro5/platform/alwin.h
INSTALL_FILES = $(DMCDIR_U)/lib/$(IMPLIB_BASENAME)
Index: makefile.vc
===================================================================
--- makefile.vc (revision 9797)
+++ makefile.vc (working copy)
@@ -330,13 +330,13 @@
HEADERS = $(MSVCDIR_U)/include/winalleg.h \
- $(MSVCDIR_U)/include/allegro/platform/aintwin.h \
- $(MSVCDIR_U)/include/allegro/platform/al386vc.h \
- $(MSVCDIR_U)/include/allegro/platform/almsvc.h \
- $(MSVCDIR_U)/include/allegro/platform/alplatf.h \
- $(MSVCDIR_U)/include/allegro/platform/astdbool.h \
- $(MSVCDIR_U)/include/allegro/platform/astdint.h \
- $(MSVCDIR_U)/include/allegro/platform/alwin.h
+ $(MSVCDIR_U)/include/allegro5/platform/aintwin.h \
+ $(MSVCDIR_U)/include/allegro5/platform/al386vc.h \
+ $(MSVCDIR_U)/include/allegro5/platform/almsvc.h \
+ $(MSVCDIR_U)/include/allegro5/platform/alplatf.h \
+ $(MSVCDIR_U)/include/allegro5/platform/astdbool.h \
+ $(MSVCDIR_U)/include/allegro5/platform/astdint.h \
+ $(MSVCDIR_U)/include/allegro5/platform/alwin.h
INSTALL_FILES = $(MSVCDIR_U)/lib/$(IMPLIB_BASENAME)
@@ -497,7 +497,7 @@
obj/msvc/asmdef.inc: obj/msvc/asmdef.exe
obj/msvc/asmdef.exe obj/msvc/asmdef.inc
-obj/msvc/asmdef.exe: src/i386/asmdef.c include/*.h include/allegro/*.h obj/msvc/asmcapa.h $(RUNNER)
+obj/msvc/asmdef.exe: src/i386/asmdef.c include/*.h include/allegro5/*.h obj/msvc/asmcapa.h $(RUNNER)
$(RUNNER) $(MSVC_CL) @ -nologo $(WFLAGS) $(CFLAGS) -I. -I./include -Foobj/msvc/asmdef.obj -Feobj/msvc/asmdef.exe src/i386/asmdef.c
obj/msvc/runner.exe: src/misc/runner.c
Index: scons/osx.scons
===================================================================
--- scons/osx.scons (revision 9797)
+++ scons/osx.scons (working copy)
@@ -9,7 +9,7 @@
context.setLibraryDir("lib/macosx")
-file = open( "include/allegro/platform/alplatf.h", "w" )
+file = open( "include/allegro5/platform/alplatf.h", "w" )
file.write( "#define ALLEGRO_MACOSX" )
file.close()
Index: docs/src/build/unix._tx
===================================================================
--- docs/src/build/unix._tx (revision 9797)
+++ docs/src/build/unix._tx (working copy)
@@ -331,15 +331,15 @@
If the Irix compiler spits strange lines such as the following when
compiling your Allegro program:
<textblock>
- include/allegro/alcompat.h:59: conflicting types for `ceilf'
+ include/allegro5/alcompat.h:59: conflicting types for `ceilf'
/usr/include/math.h:311: previous declaration of `ceilf'
- include/allegro/alcompat.h:60: conflicting types for `floorf'
+ include/allegro5/alcompat.h:60: conflicting types for `floorf'
/usr/include/math.h:333: previous declaration of `floorf'
- include/allegro/alcompat.h:63: conflicting types for `tanf'
+ include/allegro5/alcompat.h:63: conflicting types for `tanf'
/usr/include/math.h:176: previous declaration of `tanf'
- include/allegro/alcompat.h:64: conflicting types for `acosf'
+ include/allegro5/alcompat.h:64: conflicting types for `acosf'
/usr/include/math.h:106: previous declaration of `acosf'
- include/allegro/alcompat.h:65: conflicting types for `asinf'
+ include/allegro5/alcompat.h:65: conflicting types for `asinf'
/usr/include/math.h:116: previous declaration of `asinf'
<endblock>
then you should <tt>#define ALLEGRO_NO_FIX_ALIASES</tt> prior to
Index: docs/src/ahack._tx
===================================================================
--- docs/src/ahack._tx (revision 9797)
+++ docs/src/ahack._tx (working copy)
@@ -189,11 +189,11 @@
Header Files
allegro.h lives in the include/ directory. It is only a placeholder which
-includes other headers which live in the include/allegro/ tree. The reason
+includes other headers which live in the include/allegro5/ tree. The reason
for this slightly odd approach is that allegro.h can include things like
"allegro/keyboard.h", which will work both in-situ within the build
directory, and if we copy allegro.h to the system include directory and the
-other headers into system_include/allegro/. This avoids cluttering the
+other headers into system_include/allegro5/. This avoids cluttering the
system directories with lots of our headers, while still allowing programs
to just #include <allegro.h>, and also makes it possible for people to
access keyboard stuff with #include <allegro/keyboard.h>.
@@ -211,7 +211,7 @@
Every module-specific header contains structure definitions and function
prototypes. At the end of the file, it may include a header from the
-include/allegro/inline/ directory which defines related inline routines.
+include/allegro5/inline/ directory which defines related inline routines.
If inline asm is supported, this can include in turn asm.inl which imports
routines from one of the compiler-specific files al386gcc.h, al386vc.h and
al386wat.h; otherwise C versions are used instead. The header alinline.h
Index: docs/src/changes._tx
===================================================================
--- docs/src/changes._tx (revision 9797)
+++ docs/src/changes._tx (working copy)
@@ -299,7 +299,7 @@
Trent Gamblin renamed scroll_display to scroll_screen in display.c
<li>
Trent Gamblin Removed commented code from src/display.c. Removed
- include/allegro/display.h and src/compat/cogfx.c
+ include/allegro5/display.h and src/compat/cogfx.c
<li>
Elias Pschernig renamed XDUMMY driver to XGLX.
<li>
@@ -3438,7 +3438,7 @@
for MinGW32 consistent with other Windows ports.
<li>
3.9.40: Henrik Stokseth improved make install to install only the needed
- headers from the include/allegro/platform directory.
+ headers from the include/allegro5/platform directory.
<li>
3.9.40: Vincent Penquerc'h updated 7 makefiles after his header splitting
patch.
Index: docs/src/allegro._tx
===================================================================
--- docs/src/allegro._tx (revision 9797)
+++ docs/src/allegro._tx (working copy)
@@ -474,7 +474,7 @@
@xref check_cpu, cpu_vendor, cpu_family, cpu_capabilities, allegro_init
@shortdesc Contains the Intel CPU submodel.
Contains the CPU submodel, where applicable. Allegro defines at least the
- following CPU family types (see include/allegro/system.h for a more
+ following CPU family types (see include/allegro5/system.h for a more
complete list):
<textblock>
CPU_FAMILY_I586:
@@ -14751,7 +14751,7 @@
all quite minor variations on the basic code.
<li>
If you are _really_ serious about this size, thing, have a look at the top
-of include/allegro/alconfig.h and you will see the lines:
+of include/allegro5/alconfig.h and you will see the lines:
<codeblock>
#define ALLEGRO_COLOR8
#define ALLEGRO_COLOR16
Index: makefile.mgw
===================================================================
--- makefile.mgw (revision 9797)
+++ makefile.mgw (working copy)
@@ -270,13 +270,13 @@
HEADERS = $(MINGDIR_U)/include/winalleg.h \
- $(MINGDIR_U)/include/allegro/platform/aintwin.h \
- $(MINGDIR_U)/include/allegro/platform/al386gcc.h \
- $(MINGDIR_U)/include/allegro/platform/almngw32.h \
- $(MINGDIR_U)/include/allegro/platform/alplatf.h \
- $(MINGDIR_U)/include/allegro/platform/astdbool.h \
- $(MINGDIR_U)/include/allegro/platform/astdint.h \
- $(MINGDIR_U)/include/allegro/platform/alwin.h
+ $(MINGDIR_U)/include/allegro5/platform/aintwin.h \
+ $(MINGDIR_U)/include/allegro5/platform/al386gcc.h \
+ $(MINGDIR_U)/include/allegro5/platform/almngw32.h \
+ $(MINGDIR_U)/include/allegro5/platform/alplatf.h \
+ $(MINGDIR_U)/include/allegro5/platform/astdbool.h \
+ $(MINGDIR_U)/include/allegro5/platform/astdint.h \
+ $(MINGDIR_U)/include/allegro5/platform/alwin.h
INSTALL_FILES = $(MINGDIR_U)/lib/$(IMPLIB_BASENAME)
@@ -462,7 +462,7 @@
ifdef CROSSCOMPILE
-obj/mingw32/asmdef.s: src/i386/asmdef.c include/*.h include/allegro/*.h obj/mingw32/asmcapa.h
+obj/mingw32/asmdef.s: src/i386/asmdef.c include/*.h include/allegro5/*.h obj/mingw32/asmcapa.h
$(CC) $(WFLAGS) -I. -I./include -S -o obj/mingw32/asmdef.s src/i386/asmdef.c
obj/mingw32/asmdef.inc: obj/mingw32/asmdef.s
Index: makefile.lst
===================================================================
--- makefile.lst (revision 9797)
+++ makefile.lst (working copy)
@@ -653,7 +653,7 @@
$(ALLEGRO_LIB_EXES) $(ALLEGRO_EXAMPLE_EXES) $(ALLEGRO_DATAFILE_EXES) \
*.exe */*.exe */*/*.exe msvcmake.bat tests/win/*.scr \
config.cache config.log config.status stamp-h stamp-h[0-9]* suid \
- makefile.dep makefile.info include/allegro/platform/alunixac.h allegro-config
+ makefile.dep makefile.info include/allegro5/platform/alunixac.h allegro-config
VERYCLEAN_FILES = \
authors AUTHORS changes CHANGES thanks THANKS readme.txt \
Index: makefile.in
===================================================================
--- makefile.in (revision 9797)
+++ makefile.in (working copy)
@@ -50,8 +50,8 @@
mkinstalldirs = $(SHELL) $(srcdir)/misc/mkdirs.sh
-CONFIG_H = include/allegro/platform/alunixac.h
-CONFIG_H_IN = include/allegro/platform/alunixac.hin
+CONFIG_H = include/allegro5/platform/alunixac.h
+CONFIG_H_IN = include/allegro5/platform/alunixac.hin
CONFIGURE = configure
CONFIGURE_IN = configure.in
ACLOCAL_M4 = aclocal.m4
@@ -147,67 +147,67 @@
demo/demo
# Header files (look in makefile.dep for "Headers referred by symbols").
-ALLEGRO_EXTRA_HEADER = $(srcdir)/include/allegro/platform/alunix.h
-ALLEGRO_INTERNAL_HEADER = $(srcdir)/include/allegro/platform/aintunix.h
+ALLEGRO_EXTRA_HEADER = $(srcdir)/include/allegro5/platform/alunix.h
+ALLEGRO_INTERNAL_HEADER = $(srcdir)/include/allegro5/platform/aintunix.h
ALLEGRO_MMX_HEADER =
-allegro_alconfig_h = $(srcdir)/include/allegro/internal/alconfig.h \
- $(srcdir)/include/allegro/platform/alucfg.h \
+allegro_alconfig_h = $(srcdir)/include/allegro5/internal/alconfig.h \
+ $(srcdir)/include/allegro5/platform/alucfg.h \
$(CONFIG_H)
-allegro_alinline_h = $(srcdir)/include/allegro/alinline.h \
- $(srcdir)/include/allegro/platform/al386gcc.h \
- $(srcdir)/include/allegro/platform/al386vc.h \
- $(srcdir)/include/allegro/platform/al386wat.h
+allegro_alinline_h = $(srcdir)/include/allegro5/alinline.h \
+ $(srcdir)/include/allegro5/platform/al386gcc.h \
+ $(srcdir)/include/allegro5/platform/al386vc.h \
+ $(srcdir)/include/allegro5/platform/al386wat.h
allegro_h = $(srcdir)/include/allegro.h \
$(allegro_alconfig_h) \
$(allegro_alinline_h) \
- $(srcdir)/include/allegro/3d.h \
- $(srcdir)/include/allegro/3dmaths.h \
- $(srcdir)/include/allegro/alcompat.h \
- $(srcdir)/include/allegro/alinline.h \
- $(srcdir)/include/allegro/base.h \
- $(srcdir)/include/allegro/color.h \
- $(srcdir)/include/allegro/compiled.h \
- $(srcdir)/include/allegro/config.h \
- $(srcdir)/include/allegro/datafile.h \
- $(srcdir)/include/allegro/debug.h \
- $(srcdir)/include/allegro/digi.h \
- $(srcdir)/include/allegro/draw.h \
- $(srcdir)/include/allegro/file.h \
- $(srcdir)/include/allegro/fix.h \
- $(srcdir)/include/allegro/fixed.h \
- $(srcdir)/include/allegro/fli.h \
- $(srcdir)/include/allegro/fmaths.h \
- $(srcdir)/include/allegro/gfx.h \
- $(srcdir)/include/allegro/gui.h \
- $(srcdir)/include/allegro/joystick.h \
- $(srcdir)/include/allegro/keyboard.h \
- $(srcdir)/include/allegro/matrix.h \
- $(srcdir)/include/allegro/midi.h \
- $(srcdir)/include/allegro/mouse.h \
- $(srcdir)/include/allegro/palette.h \
- $(srcdir)/include/allegro/quat.h \
- $(srcdir)/include/allegro/rle.h \
- $(srcdir)/include/allegro/sound.h \
- $(srcdir)/include/allegro/stream.h \
- $(srcdir)/include/allegro/system.h \
- $(srcdir)/include/allegro/text.h \
- $(srcdir)/include/allegro/timer.h \
- $(srcdir)/include/allegro/unicode.h \
- $(srcdir)/include/allegro/graphics.h \
- $(srcdir)/include/allegro/inline/3dmaths.inl \
- $(srcdir)/include/allegro/inline/asm.inl \
- $(srcdir)/include/allegro/inline/color.inl \
- $(srcdir)/include/allegro/inline/draw.inl \
- $(srcdir)/include/allegro/inline/fix.inl \
- $(srcdir)/include/allegro/inline/fmaths.inl \
- $(srcdir)/include/allegro/inline/gfx.inl \
- $(srcdir)/include/allegro/inline/matrix.inl \
- $(srcdir)/include/allegro/inline/rle.inl \
- $(srcdir)/include/allegro/inline/system.inl \
+ $(srcdir)/include/allegro5/3d.h \
+ $(srcdir)/include/allegro5/3dmaths.h \
+ $(srcdir)/include/allegro5/alcompat.h \
+ $(srcdir)/include/allegro5/alinline.h \
+ $(srcdir)/include/allegro5/base.h \
+ $(srcdir)/include/allegro5/color.h \
+ $(srcdir)/include/allegro5/compiled.h \
+ $(srcdir)/include/allegro5/config.h \
+ $(srcdir)/include/allegro5/datafile.h \
+ $(srcdir)/include/allegro5/debug.h \
+ $(srcdir)/include/allegro5/digi.h \
+ $(srcdir)/include/allegro5/draw.h \
+ $(srcdir)/include/allegro5/file.h \
+ $(srcdir)/include/allegro5/fix.h \
+ $(srcdir)/include/allegro5/fixed.h \
+ $(srcdir)/include/allegro5/fli.h \
+ $(srcdir)/include/allegro5/fmaths.h \
+ $(srcdir)/include/allegro5/gfx.h \
+ $(srcdir)/include/allegro5/gui.h \
+ $(srcdir)/include/allegro5/joystick.h \
+ $(srcdir)/include/allegro5/keyboard.h \
+ $(srcdir)/include/allegro5/matrix.h \
+ $(srcdir)/include/allegro5/midi.h \
+ $(srcdir)/include/allegro5/mouse.h \
+ $(srcdir)/include/allegro5/palette.h \
+ $(srcdir)/include/allegro5/quat.h \
+ $(srcdir)/include/allegro5/rle.h \
+ $(srcdir)/include/allegro5/sound.h \
+ $(srcdir)/include/allegro5/stream.h \
+ $(srcdir)/include/allegro5/system.h \
+ $(srcdir)/include/allegro5/text.h \
+ $(srcdir)/include/allegro5/timer.h \
+ $(srcdir)/include/allegro5/unicode.h \
+ $(srcdir)/include/allegro5/graphics.h \
+ $(srcdir)/include/allegro5/inline/3dmaths.inl \
+ $(srcdir)/include/allegro5/inline/asm.inl \
+ $(srcdir)/include/allegro5/inline/color.inl \
+ $(srcdir)/include/allegro5/inline/draw.inl \
+ $(srcdir)/include/allegro5/inline/fix.inl \
+ $(srcdir)/include/allegro5/inline/fmaths.inl \
+ $(srcdir)/include/allegro5/inline/gfx.inl \
+ $(srcdir)/include/allegro5/inline/matrix.inl \
+ $(srcdir)/include/allegro5/inline/rle.inl \
+ $(srcdir)/include/allegro5/inline/system.inl \
$(ALLEGRO_EXTRA_HEADER)
-allegro_internal_aintern_h = $(srcdir)/include/allegro/internal/aintern.h
-allegro_aintdos_h = $(srcdir)/include/allegro/platform/aintdos.h \
- $(srcdir)/include/allegro/internal/aintvga.h
+allegro_internal_aintern_h = $(srcdir)/include/allegro5/internal/aintern.h
+allegro_aintdos_h = $(srcdir)/include/allegro5/platform/aintdos.h \
+ $(srcdir)/include/allegro5/internal/aintvga.h
obj_unix_asmdef_inc = $(OBJDIR)/asmdef.inc
xalleg_h = $(srcdir)/include/xalleg.h
@@ -216,7 +216,7 @@
ifdef CROSSCOMPILE
-$(OBJDIR)/asmdef.s: src/i386/asmdef.c include/*.h include/allegro/*.h
+$(OBJDIR)/asmdef.s: src/i386/asmdef.c include/*.h include/allegro5/*.h
$(CC) $(INCLUDES) `echo $(CFLAGS) | sed -e "s/.*\(-DALLEGRO_NO_ASM\).*/\1/"` -S -o $(OBJDIR)/asmdef.s src/i386/asmdef.c
$(obj_unix_asmdef_inc): $(OBJDIR)/asmdef.s
@@ -442,7 +442,7 @@
rm -f makefile
maintainer-clean: veryclean
- rm -f configure include/allegro/platform/alunixac.hin
+ rm -f configure include/allegro5/platform/alunixac.hin
rm -rf autom4te*
@@ -518,19 +518,19 @@
$(INSTALL_DATA) $(srcdir)/include/xalleg.h $(DESTDIR)$(includedir)/
$(INSTALL_DATA) $(srcdir)/include/linalleg.h $(DESTDIR)$(includedir)/
$(INSTALL_DATA) $(CONFIG_H) $(DESTDIR)$(includedir)/allegro/
- @for file in $(srcdir)/include/allegro/*.h; do \
+ @for file in $(srcdir)/include/allegro5/*.h; do \
echo Installing $$file to $(DESTDIR)$(includedir)/allegro; \
$(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/allegro/; \
done
- @for file in $(srcdir)/include/allegro/inline/*.inl; do \
+ @for file in $(srcdir)/include/allegro5/inline/*.inl; do \
echo Installing $$file to $(DESTDIR)$(includedir)/allegro/inline; \
$(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/allegro/inline/; \
done
- @for file in $(srcdir)/include/allegro/internal/*.h; do \
+ @for file in $(srcdir)/include/allegro5/internal/*.h; do \
echo Installing $$file to $(DESTDIR)$(includedir)/allegro/internal; \
$(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/allegro/internal/; \
done
- @for file in $(srcdir)/include/allegro/platform/*.h; do \
+ @for file in $(srcdir)/include/allegro5/platform/*.h; do \
echo Installing $$file to $(DESTDIR)$(includedir)/allegro/platform; \
$(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/allegro/platform/; \
done
Index: include/allegro5/platform/astdint.h
===================================================================
--- include/allegro5/platform/astdint.h (revision 9797)
+++ include/allegro5/platform/astdint.h (working copy)
@@ -18,7 +18,7 @@
#ifndef ASTDINT_H
#define ASTDINT_H
-/* Please only include this file from include/allegro/internal/alconfig.h
+/* Please only include this file from include/allegro5/internal/alconfig.h
* and don't add more than inttypes.h/stdint.h emulation here. Thanks.
*/
Index: makefile.all
===================================================================
--- makefile.all (revision 9797)
+++ makefile.all (working copy)
@@ -317,16 +317,16 @@
ifdef UNIX_TOOLS
-$(INSTALLDIR_U)/$(INCDIR_U)/allegro/platform/%.h: include/allegro/platform/%.h
+$(INSTALLDIR_U)/$(INCDIR_U)/allegro/platform/%.h: include/allegro5/platform/%.h
cp $< $@
-$(INSTALLDIR_U)/$(INCDIR_U)/allegro/internal/%.h: include/allegro/internal/%.h
+$(INSTALLDIR_U)/$(INCDIR_U)/allegro/internal/%.h: include/allegro5/internal/%.h
cp $< $@
-$(INSTALLDIR_U)/$(INCDIR_U)/allegro/inline/%.inl: include/allegro/inline/%.inl
+$(INSTALLDIR_U)/$(INCDIR_U)/allegro/inline/%.inl: include/allegro5/inline/%.inl
cp $< $@
-$(INSTALLDIR_U)/$(INCDIR_U)/allegro/%.h: include/allegro/%.h
+$(INSTALLDIR_U)/$(INCDIR_U)/allegro/%.h: include/allegro5/%.h
cp $< $@
$(INSTALLDIR_U)/$(INCDIR_U)/%.h: include/%.h
@@ -334,16 +334,16 @@
else
-$(INSTALLDIR_U)/$(INCDIR_U)/allegro/platform/%.h: include/allegro/platform/%.h
+$(INSTALLDIR_U)/$(INCDIR_U)/allegro/platform/%.h: include/allegro5/platform/%.h
copy $(subst /,\,$< $@)
-$(INSTALLDIR_U)/$(INCDIR_U)/allegro/internal/%.h: include/allegro/internal/%.h
+$(INSTALLDIR_U)/$(INCDIR_U)/allegro/internal/%.h: include/allegro5/internal/%.h
copy $(subst /,\,$< $@)
-$(INSTALLDIR_U)/$(INCDIR_U)/allegro/inline/%.inl: include/allegro/inline/%.inl
+$(INSTALLDIR_U)/$(INCDIR_U)/allegro/inline/%.inl: include/allegro5/inline/%.inl
copy $(subst /,\,$< $@)
-$(INSTALLDIR_U)/$(INCDIR_U)/allegro/%.h: include/allegro/%.h
+$(INSTALLDIR_U)/$(INCDIR_U)/allegro/%.h: include/allegro5/%.h
copy $(subst /,\,$< $@)
$(INSTALLDIR_U)/$(INCDIR_U)/%.h: include/%.h
@@ -353,9 +353,9 @@
INSTALL_FILES += $(INSTALLDIR_U)/$(INCDIR_U)/allegro.h \
- $(addprefix $(INSTALLDIR_U)/$(INCDIR_U)/allegro/,$(notdir $(wildcard include/allegro/*.h))) \
- $(addprefix $(INSTALLDIR_U)/$(INCDIR_U)/allegro/internal/,$(notdir $(wildcard include/allegro/internal/*.h))) \
- $(addprefix $(INSTALLDIR_U)/$(INCDIR_U)/allegro/inline/,$(notdir $(wildcard include/allegro/inline/*.inl)))
+ $(addprefix $(INSTALLDIR_U)/$(INCDIR_U)/allegro/,$(notdir $(wildcard include/allegro5/*.h))) \
+ $(addprefix $(INSTALLDIR_U)/$(INCDIR_U)/allegro/internal/,$(notdir $(wildcard include/allegro5/internal/*.h))) \
+ $(addprefix $(INSTALLDIR_U)/$(INCDIR_U)/allegro/inline/,$(notdir $(wildcard include/allegro5/inline/*.inl)))
generic-install: create-install-dirs $(INSTALL_FILES)
Index: configure.in
===================================================================
--- configure.in (revision 9797)
+++ configure.in (working copy)
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
#
# Note we no longer use `autoheader' to produce
-# include/allegro/platform/alunixac.hin.
+# include/allegro5/platform/alunixac.hin.
# If you AC_DEFINE a new symbol in this file, you must add it there also.
#
# Feel free to use # to denote comments. Traditionally we used `dnl' but it
@@ -983,7 +983,7 @@
fi
dnl Prepare alunixac.h.
-AC_CONFIG_HEADER(include/allegro/platform/alunixac.h:include/allegro/platform/alunixac.hin)
+AC_CONFIG_HEADER(include/allegro5/platform/alunixac.h:include/allegro5/platform/alunixac.hin)
dnl Cosmetics for allegro-config
FRAMEWORKS=
Index: misc/fixver.sh
===================================================================
--- misc/fixver.sh (revision 9797)
+++ misc/fixver.sh (working copy)
@@ -45,9 +45,9 @@
echo "s/\#define ALLEGRO_DATE_STR .*/\#define ALLEGRO_DATE_STR \"$year\"/" >> fixver.sed
echo "s/\#define ALLEGRO_DATE .*/\#define ALLEGRO_DATE $year$month$day \/\* yyyymmdd \*\//" >> fixver.sed
-echo "Patching include/allegro/base.h..."
-cp include/allegro/base.h fixver.tmp
-sed -f fixver.sed fixver.tmp > include/allegro/base.h
+echo "Patching include/allegro5/base.h..."
+cp include/allegro5/base.h fixver.tmp
+sed -f fixver.sed fixver.tmp > include/allegro5/base.h
# Note: DMC does not support { and } in resource files so we use
# BEGIN and END instead.
Index: misc/fixpatch.sh
===================================================================
--- misc/fixpatch.sh (revision 9797)
+++ misc/fixpatch.sh (working copy)
@@ -7,7 +7,7 @@
touch makefile.in
touch aclocal.m4
touch acconfig.h
-touch include/allegro/platform/alunixac.hin
+touch include/allegro5/platform/alunixac.hin
touch stamp-h.in
touch configure
Index: fix.sh
===================================================================
--- fix.sh (revision 9797)
+++ fix.sh (working copy)
@@ -30,8 +30,8 @@
echo "include makefile.all" >> makefile
fi
- echo "/* generated by fix.sh */" > include/allegro/platform/alplatf.h
- echo "#define $3" >> include/allegro/platform/alplatf.h
+ echo "/* generated by fix.sh */" > include/allegro5/platform/alplatf.h
+ echo "#define $3" >> include/allegro5/platform/alplatf.h
}
proc_fix_osx_ub()
@@ -43,8 +43,8 @@
echo "MAKEFILE_INC = makefile.osx" >> makefile
echo "include makefile.all" >> makefile
- echo "/* generated by fix.sh */" > include/allegro/platform/alplatf.h
- echo "#define ALLEGRO_MACOSX" >> include/allegro/platform/alplatf.h
+ echo "/* generated by fix.sh */" > include/allegro5/platform/alplatf.h
+ echo "#define ALLEGRO_MACOSX" >> include/allegro5/platform/alplatf.h
}
proc_filelist()
Index: makefile.bcc
===================================================================
--- makefile.bcc (revision 9797)
+++ makefile.bcc (working copy)
@@ -175,13 +175,13 @@
HEADERS = $(BCC32DIR_U)/include/winalleg.h \
- $(BCC32DIR_U)/include/allegro/platform/aintwin.h \
- $(BCC32DIR_U)/include/allegro/platform/al386gcc.h \
- $(BCC32DIR_U)/include/allegro/platform/albcc32.h \
- $(BCC32DIR_U)/include/allegro/platform/alplatf.h \
- $(BCC32DIR_U)/include/allegro/platform/astdbool.h \
- $(BCC32DIR_U)/include/allegro/platform/astdint.h \
- $(BCC32DIR_U)/include/allegro/platform/alwin.h
+ $(BCC32DIR_U)/include/allegro5/platform/aintwin.h \
+ $(BCC32DIR_U)/include/allegro5/platform/al386gcc.h \
+ $(BCC32DIR_U)/include/allegro5/platform/albcc32.h \
+ $(BCC32DIR_U)/include/allegro5/platform/alplatf.h \
+ $(BCC32DIR_U)/include/allegro5/platform/astdbool.h \
+ $(BCC32DIR_U)/include/allegro5/platform/astdint.h \
+ $(BCC32DIR_U)/include/allegro5/platform/alwin.h
INSTALL_FILES = $(BCC32DIR_U)/lib/$(IMPLIB_BASENAME)