| Re: [AD] removing asm in 4.3.10 |
[ Thread Index |
Date Index
| More lists.liballeg.org/allegro-developers Archives
]
Just noticed I posted a wrong patch. Here is the good one.
--
Milan Mimica
http://sparklet.sf.net
Index: docs/src/build/dmc._tx
===================================================================
--- docs/src/build/dmc._tx (revision 9738)
+++ docs/src/build/dmc._tx (working copy)
@@ -25,8 +25,7 @@
Status: complete.
- Caveats: The DMC port does not support assembly, so ALLEGRO_USE_C must be
- set when compiling. The DMC runtime library does not support unicode paths.
+ Caveats: The DMC runtime library does not support unicode paths.
DMC is the only Windows compiler that can build a static library that can
be used with DAllegro.
@@ -76,10 +75,10 @@
cd\allegro
fix dmc
gmake obj\dmc\plugins.h
- gmake all ALLEGRO_USE_C=1 STATICLINK=1
- gmake installall ALLEGRO_USE_C=1 STATICLINK=1
- gmake all ALLEGRO_USE_C=1
- gmake installall ALLEGRO_USE_C=1
+ gmake all STATICLINK=1
+ gmake installall STATICLINK=1
+ gmake all
+ gmake installall
<endblock>
@hnode Advanced Build Options
@@ -92,8 +91,8 @@
from the command line. For example:
<textblock>
- gmake ALLEGRO_USE_C=1
- gmake install ALLEGRO_USE_C=1
+ gmake
+ gmake install
<endblock>
builds and installs the optimized, dynamic Allegro library along with all of
@@ -101,17 +100,17 @@
install the debug and profiling versions:
<textblock>
- gmake ALLEGRO_USE_C=1 DEBUGMODE=1
- gmake install ALLEGRO_USE_C=1 DEBUGMODE=1
- gmake ALLEGRO_USE_C=1 PROFILEMODE=1
- gmake install ALLEGRO_USE_C=1 PROFILEMODE=1
+ gmake DEBUGMODE=1
+ gmake install DEBUGMODE=1
+ gmake PROFILEMODE=1
+ gmake install PROFILEMODE=1
<endblock>
If you only want to build the library (without the extra stuff), specifically
request to make the lib target:
<textblock>
- gmake lib ALLEGRO_USE_C=1
+ gmake lib
<endblock>
That would only build the optimized, dynamic Allegro library. Other targets
@@ -119,11 +118,8 @@
information. All of the options can be mixed and matched where it makes
sense.
- Note that DMC can only build the C version of Allegro (as opposed to using
- some assembly), so the ALLEGRO_USE_C=1 option is mandatory.
-
@heading
Using Allegro
Index: docs/src/allegro._tx
===================================================================
--- docs/src/allegro._tx (revision 9738)
+++ docs/src/allegro._tx (working copy)
@@ -14954,11 +14954,6 @@
CROSSCOMPILE=1 (DJGPP, MinGW only)<br>
Allows you to build the library under Linux by using a cross-compiler.
<li>
- ALLEGRO_USE_C=1 (GCC-based platforms only)<br>
- Allows you to build the library using C drawing code instead of the usual
- asm routines. This is only really useful for testing, since the asm
- version is faster.
-<li>
UNIX_TOOLS=1<br>
Instructs the build process to use Unix-like tools instead of DOS tools.
Note that you usually don't need to set it because the build process will
Index: makefile.in
===================================================================
--- makefile.in (revision 9738)
+++ makefile.in (working copy)
@@ -150,7 +150,7 @@
ALLEGRO_LIBRARY_SOURCES = \
$(ALLEGRO_SRC_FILES) \
$(ALLEGRO_SRC_UNIX_FILES) \
- $(@ALLEGRO_MAYBE_ASM_FILES@) \
+ $(ALLEGRO_SRC_C_FILES) \
$(@ALLEGRO_MAYBE_XWINDOWS_FILES@) \
$(@ALLEGRO_MAYBE_LINUX_FILES@)
Index: makefile.all
===================================================================
--- makefile.all (revision 9738)
+++ makefile.all (working copy)
@@ -49,6 +49,7 @@
# -------- check environment to see what type of library to build --------
+ALLEGRO_USE_C = 1
include makefile.inf
Index: configure.in
===================================================================
--- configure.in (revision 9738)
+++ configure.in (working copy)
@@ -19,12 +19,6 @@
dnl Build CFLAGS from scratch
CFLAGS=
-dnl Enable asm code in the library (default)
-AC_ARG_ENABLE(asm,
-[ --enable-asm[=x] enable the use of asm code [default=yes]],
-test "X$enableval" != "Xno" && allegro_enable_asm=yes,
-allegro_enable_asm=yes)
-
dnl Enable 8-bpp color depth (default).
AC_ARG_ENABLE(color8,
[ --enable-color8[=x] enable support for 8-bpp modes [default=yes]],
@@ -173,49 +167,6 @@
ALLEGRO_ACTEST_GCC_AMD64_MTUNE
fi
-dnl Test for asm support.
-if test "X$allegro_enable_asm" = "Xyes"; then
- if test "X$allegro_cv_processor_type" = "Xi386"; then
- ALLEGRO_MAYBE_ASM_FILES=ALLEGRO_SRC_I386_FILES
- _code_features="i386 asm"
-
- dnl Test for MMX support.
- ALLEGRO_ACTEST_SUPPORT_MMX
- if test "X$allegro_cv_support_mmx" = "Xyes"; then
- AC_DEFINE(ALLEGRO_MMX,1,[Define if assembler supports MMX.])
- _code_features="$_code_features, MMX"
- fi
-
- dnl Test for SSE support.
- ALLEGRO_ACTEST_SUPPORT_SSE
- if test "X$allegro_cv_support_sse" = "Xyes"; then
- AC_DEFINE(ALLEGRO_SSE,1,[Define if assembler supports SSE.])
- _code_features="$_code_features, SSE"
- fi
- elif test "X$allegro_cv_processor_type" = "Xamd64"; then
- ALLEGRO_MAYBE_ASM_FILES=ALLEGRO_SRC_AMD64_FILES
- _code_features="amd64 asm"
-
- dnl MMX support available if AMD64 is available, but we can't use it yet.
- dnl AC_DEFINE(ALLEGRO_MMX,1,[Define if assembler supports MMX.])
- dnl _code_features="$_code_features, MMX"
-
- dnl SSE support available if AMD64 is available, but we can't use it yet.
- dnl AC_DEFINE(ALLEGRO_SSE,1,[Define if assembler supports SSE.])
- dnl _code_features="$_code_features, SSE"
- fi
-fi
-
-if test -z "$ALLEGRO_MAYBE_ASM_FILES"; then
- ALLEGRO_MAYBE_ASM_FILES=ALLEGRO_SRC_C_FILES
- CFLAGS="$CFLAGS -DALLEGRO_NO_ASM"
- AC_DEFINE(ALLEGRO_NO_ASM,1,
- [Define for Unix platforms, to use C convention for bank switching.])
- _code_features="C only"
-fi
-
-AC_SUBST(ALLEGRO_MAYBE_ASM_FILES)
-
dnl Test for underscore prepended by compiler.
ALLEGRO_ACTEST_ASM_PREFIX
if test "$allegro_cv_asm_prefix" != ""; then
@@ -226,7 +177,7 @@
dnl Test target machine endianess.
AC_C_BIGENDIAN([
AC_DEFINE(ALLEGRO_BIG_ENDIAN,1,[Define if target machine is big endian.])
- _code_features="big endian, $_code_features"
+ _code_features="big endian"
],[
AC_DEFINE(ALLEGRO_LITTLE_ENDIAN,1,[Define if target machine is little endian.])
_code_features="little endian, $_code_features"
Index: makefile.inf
===================================================================
--- makefile.inf (revision 9738)
+++ makefile.inf (working copy)
@@ -59,7 +59,7 @@
endif
ifdef ALLEGRO_USE_C
- NO_ASM_SUFFIX = _c
+ NO_ASM_SUFFIX =
else
NO_ASM_SUFFIX =
endif