Skip to content
Browse files

Correct if statement in asap/xasm and support building with older ver…

…sions of gdc
  • Loading branch information...
1 parent 9a47f64 commit 3c2512ce8a9d6e1d8cb3aa2fcec16db1fda3bc69 @NHellFire NHellFire committed Oct 12, 2012
Showing with 6 additions and 5 deletions.
  1. +1 −1 configure.in
  2. +1 −1 lib/asap/Makefile.in
  3. +3 −2 lib/asap/xasm/Makefile
  4. +1 −1 lib/asap/xasm/xasm.d
View
2 configure.in
@@ -2120,7 +2120,7 @@ else
fi
if test "$use_asap" = "yes"; then
- AC_CHECK_PROG(HAVE_GDC,gdc,"yes","no")
+ AC_CHECK_PROGS(HAVE_GDC,gdc-4.4 gdc-4.3 gdc,"no")
if test "$HAVE_GDC" = "no"; then
AC_MSG_ERROR($missing_program);
fi
View
2 lib/asap/Makefile.in
@@ -73,7 +73,7 @@ mads/mads: force
make -C mads
xasm/xasm: force
- make -C xasm
+ make -C xasm GDC=@HAVE_GDC@
players/cmc.obx: players/cmc.asx xasm/xasm
$(XASM) -d CM3=0 -o $@ players/cmc.asx
View
5 lib/asap/xasm/Makefile
@@ -5,14 +5,15 @@ ASCIIDOC_POSTPROCESS = perl -pi.bak -e "s/527bbd;/20a0a0;/;END{unlink '$@.bak'}"
ASCIIDOC_VALIDATE = xmllint --valid --noout --nonet $@
RM = rm -f
ZIP = 7z a -mx=9 -tzip $@
+GDC ?= gdc
all: xasm
xasm.o: xasm.d
- gdc -c -o xasm.o -O2 $<
+ $(GDC) -c -o xasm.o -O2 $<
xasm: xasm.o
- gdc -o xasm xasm.o
+ $(GDC) -o xasm xasm.o
xasm.html: xasm.1.txt
$(ASCIIDOC) -d manpage $<
View
2 lib/asap/xasm/xasm.d
@@ -548,7 +548,7 @@ int operatorShiftLeft(int a, int b) {
if (b < 0) {
return operatorShiftRight(a, -b);
}
- if (a != 0 & b >= 32) {
+ if (a != 0 && b >= 32) {
throw new AssemblyError("Arithmetic overflow");
}
long r = cast(long) a << b;

0 comments on commit 3c2512c

Please sign in to comment.
Something went wrong with that request. Please try again.