| Re: [AD] non-x86 unix build patch |
[ Thread Index |
Date Index
| More lists.liballeg.org/allegro-developers Archives
]
> Hmm... looks to me that it shouldn't be trying to build icolconv.s on
> non-x86 platforms in the first place. I'll look into this a bit further.
The attached patch moves the icolconv.s file to ALLEGRO_SRC_I386_FILES
rather than listing it directly for the X11 and Windows ports. It also
moves ccolconv.c to ALLEGRO_SRC_C_FILES, both of which makes a lot more
sense to me.
Tested on Linux (on PC) and Solaris (SPARC). Additonal tests needed on
Windows and MacOS X (and possibly DOS) to make sure this patch has no
negative side effects.
Evert
Index: allegro/makefile.lst
===================================================================
RCS file: /cvsroot/alleg/allegro/makefile.lst,v
retrieving revision 1.101
diff -u -r1.101 makefile.lst
--- allegro/makefile.lst 5 Aug 2004 08:18:17 -0000 1.101
+++ allegro/makefile.lst 6 Aug 2004 15:24:07 -0000
@@ -89,7 +89,8 @@
src/c/czscan16.c \
src/c/czscan24.c \
src/c/czscan32.c \
- src/c/czscan8.c
+ src/c/czscan8.c \
+ src/misc/ccolconv.c
ALLEGRO_SRC_I386_FILES = \
src/i386/iblit16.s \
@@ -113,7 +114,8 @@
src/i386/ispr32.s \
src/i386/ispr8.s \
src/i386/istretch.c \
- src/i386/izbuf.s
+ src/i386/izbuf.s \
+ src/misc/icolconv.s
ALLEGRO_SRC_DOS_FILES = \
src/dos/adlib.c \
@@ -199,7 +201,6 @@
src/win/wtimer.c \
src/win/wwnd.c \
src/misc/colconv.c \
- src/misc/icolconv.s \
src/misc/pckeys.c
ALLEGRO_SRC_BEOS_FILES = \
@@ -236,7 +237,6 @@
src/beos/bwscreen.cpp \
src/unix/ufile.c \
src/misc/colconv.c \
- src/misc/icolconv.s \
src/misc/pckeys.c
ALLEGRO_SRC_LINUX_FILES = \
@@ -307,8 +307,6 @@
src/x/xdga2s.s \
src/x/xwins.s \
src/misc/colconv.c \
- src/misc/ccolconv.c \
- src/misc/icolconv.s \
src/misc/pckeys.c
ALLEGRO_SRC_QNX_FILES = \
@@ -331,7 +329,6 @@
src/unix/usystem.c \
src/unix/uthreads.c \
src/misc/colconv.c \
- src/misc/icolconv.s \
src/misc/pckeys.c
ALLEGRO_SRC_MACOSX_FILES = \
@@ -353,7 +350,6 @@
src/unix/uptimer.c \
src/unix/usystem.c \
src/unix/uthreads.c \
- src/misc/ccolconv.c \
src/misc/colconv.c
ALLEGRO_MODULE_VGA_FILES = \