Skip to content

Commit

Permalink
Commit
Browse files Browse the repository at this point in the history
  • Loading branch information
amadvance committed Aug 20, 2002
1 parent 96c4ce7 commit 988431a
Show file tree
Hide file tree
Showing 22 changed files with 3,952 additions and 3,273 deletions.
339 changes: 339 additions & 0 deletions COPYING

Large diffs are not rendered by default.

52 changes: 44 additions & 8 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,9 @@ CONF_LDFLAGS=@CONF_LDFLAGS@
CONF_DEBUGGER=@CONF_DEBUGGER@
CONF_COMPRESS=@CONF_COMPRESS@
CONF_DEBUG=@CONF_DEBUG@
CONF_ARCH=@CONF_ARCH@
endif


#############################################################################
# Default configuration
#
Expand Down Expand Up @@ -203,7 +203,7 @@ endif

# Name of the architecture. Used in the distribution file names.
ifndef CONF_ARCH
CONF_ARCH=def
CONF_ARCH=blend
endif

############################################################################
Expand Down Expand Up @@ -474,12 +474,29 @@ include $(srcdir)/advance/d2.mak
endif

#############################################################################
# Special targets
# Standard GNU targets

info:

dvi:

installcheck: install

check:

mostlyclean: distclean

maintainer-clear: distclean

clean:
$(RM) -f -r obj

distclean: clean
$(RM) -f config.status config.log

#############################################################################
# Special targets

flags: obj
$(ECHO) CFLAGS=$(CFLAGS)
$(ECHO) LDFLAGS=$(LDFLAGS)
Expand All @@ -504,11 +521,30 @@ osdep:
rgrep -r WIN32 $(srcdir)/advance

costadvance:
sloccount advance/blit advance/card advance/cfg advance/common \
advance/dos advance/j advance/k advance/lib advance/line \
advance/linux advance/m advance/menu advance/off advance/osd \
advance/portio advance/s advance/sdl advance/tsr advance/v \
advance/vbe advance/vga advance/video \
sloccount \
advance/blit \
advance/card \
advance/cfg \
advance/common \
advance/d2 \
advance/dos \
advance/j \
advance/k \
advance/lib \
advance/line \
advance/linux \
advance/m \
advance/menu \
advance/off \
advance/osd \
advance/portio \
advance/s \
advance/sdl \
advance/tsr \
advance/v \
advance/vbe \
advance/vga \
advance/video \
> cost/advance.txt

costmame:
Expand Down
81 changes: 81 additions & 0 deletions aclocal.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
dnl @synopsis AC_CHECK_CC_OPT(flag, varname)
dnl
dnl AC_CHECK_CC_OPT(-fvomit-frame,vomitframe)
dnl would show a message as like
dnl "checking wether gcc accepts -fvomit-frame ... no"
dnl and sets the shell-variable $vomitframe to either "yes"
dnl or "no".

AC_DEFUN(AC_CHECK_CC_OPT,
[
AC_MSG_CHECKING([whether ${CC-cc} accepts $1])
echo 'void f(){}' > conftest.c
if test -z "`${CC-cc} -c $1 conftest.c 2>&1`"; then
$2="yes"
else
$2="no"
fi
rm -f conftest*
AC_MSG_RESULT(${$2})
])

dnl @synopsis AC_CHECK_CPU_ARCH
dnl

AC_DEFUN(AC_CHECK_CPU_ARCH,
[
if grep -i "family.*:.*3" /proc/cpuinfo > /dev/null ; then
ac_cpu_arch="i386"
ac_cpu_family=3
elif grep -i "family.*:.*4" /proc/cpuinfo > /dev/null ; then
ac_cpu_arch="i486"
ac_cpu_family=4
elif grep -i "family.*:.*5" /proc/cpuinfo > /dev/null ; then
if grep -i "model name.*:.*K6" /proc/cpuinfo > /dev/null ; then
ac_cpu_arch="k6"
elif grep -i "model name.*:.*Pentium MMX" /proc/cpuinfo > /dev/null ; then
ac_cpu_arch="pentium-mmx"
elif grep -i "model name.*:.*Pentium" /proc/cpuinfo > /dev/null ; then
ac_cpu_arch="pentium"
else
ac_cpu_arch="i586"
fi
ac_cpu_family=5
elif grep "family.*:.*6" /proc/cpuinfo > /dev/null ; then
if grep -i "model name.*:.*Athlon" /proc/cpuinfo > /dev/null ; then
ac_cpu_arch="athlon"
elif grep -i "model name.*:.*Pentium IV" /proc/cpuinfo > /dev/null ; then
ac_cpu_arch="pentium4"
elif grep -i "model name.*:.*Pentium III" /proc/cpuinfo > /dev/null ; then
ac_cpu_arch="pentium3"
elif grep -i "model name.*:.*Pentium II" /proc/cpuinfo > /dev/null ; then
ac_cpu_arch="pentium2"
elif grep -i "model name.*:.*Pentium Pro" /proc/cpuinfo > /dev/null ; then
ac_cpu_arch="pentiumpro"
else
ac_cpu_arch="i686"
fi
ac_cpu_family=6
else
AC_MSG_WARN([Unrecognized /proc/cpuinfo, assuming i686])
ac_cpu_arch="i686"
ac_cpu_family=6
fi
AC_MSG_CHECKING([host cpu, family])
AC_MSG_RESULT([$ac_cpu_arch, $ac_cpu_family])
])

AC_DEFUN(AC_CHECK_CC_ARCH,
[
AC_CHECK_CC_OPT([-march=$ac_cpu_arch],ac_cc_cpu_arch)
if test $ac_cc_cpu_arch = yes ; then
ac_cc_arch=$ac_cpu_arch
else
AC_CHECK_CC_OPT([-march=i${ac_cpu_family}86],ac_cc_family_arch)
if test $ac_cc_family_arch = yes ; then
ac_cc_arch=i${ac_cpu_family}86
else
ac_cc_arch=blend
fi
fi
])
111 changes: 68 additions & 43 deletions advance/advance.mak
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ else
EMUVERSION = 0.61.2
endif
endif
MENUVERSION = 2.0.1
MENUVERSION = 2.1.0
CABVERSION = 0.11.3

############################################################################
Expand Down Expand Up @@ -138,7 +138,8 @@ LIB_SRC = \
$(wildcard $(srcdir)/advance/lib/*.c) \
$(wildcard $(srcdir)/advance/lib/*.h) \
$(wildcard $(srcdir)/advance/lib/*.ico) \
$(wildcard $(srcdir)/advance/lib/*.rc)
$(wildcard $(srcdir)/advance/lib/*.rc) \
$(wildcard $(srcdir)/advance/lib/*.dat)

BLIT_SRC = \
$(wildcard $(srcdir)/advance/blit/*.c) \
Expand Down Expand Up @@ -218,7 +219,7 @@ SDL_SRC = \
D2_SRC = \
$(wildcard $(srcdir)/advance/d2/*.cc)

CONF_BIN = \
CONF_SRC = \
$(srcdir)/Makefile.in \
$(srcdir)/config.guess \
$(srcdir)/config.status \
Expand All @@ -230,7 +231,8 @@ CONF_BIN = \
$(srcdir)/install-sh \
$(srcdir)/mkinstalldirs

CONF_SRC = \
CONF_BIN = \
$(srcdir)/support/confbin/INSTALL \
$(srcdir)/support/confbin/Makefile.am \
$(srcdir)/support/confbin/Makefile.in \
$(srcdir)/support/confbin/aclocal.m4 \
Expand All @@ -244,15 +246,14 @@ CONF_SRC = \
############################################################################
# Common install

install_data: $(INSTALL_DATAFILES)
installdirs:
-$(INSTALL_DATA_DIR) $(PREFIX)/doc/advance
-$(INSTALL_MAN_DIR) $(PREFIX)/man/man1
-$(INSTALL_DATA_DIR) $(PREFIX)/share/advance
ifdef INSTALL_DATAFILES
-$(INSTALL_DATA_DIR) $(PREFIX)/share/advance/rom
-$(INSTALL_DATA_DIR) $(PREFIX)/share/advance/sample
-$(INSTALL_DATA_DIR) $(PREFIX)/share/advance/artwork
@for i in $(INSTALL_DATAFILES); do \
$(INSTALL_DATA) $$i $(PREFIX)/share/advance; \
done
endif
ifdef INSTALL_IMAGEDIRS
-$(INSTALL_DATA_DIR) $(PREFIX)/share/advance/image
Expand All @@ -261,28 +262,63 @@ ifdef INSTALL_IMAGEDIRS
done
endif

install_bin: $(INSTALL_BINFILES)
install-data: $(INSTALL_DATAFILES)
ifdef INSTALL_DATAFILES
@for i in $(INSTALL_DATAFILES); do \
$(INSTALL_DATA) $$i $(PREFIX)/share/advance; \
done
endif

uninstall-data:
ifdef INSTALL_DATAFILES
@for i in $(INSTALL_DATAFILES); do \
rm -f $(PREFIX)/share/advance/$$i; \
done
endif

install-bin: $(INSTALL_BINFILES)
@for i in $(INSTALL_BINFILES); do \
$(INSTALL_PROGRAM) $$i $(PREFIX)/bin; \
done

install_doc: $(INSTALL_DOCFILES)
uninstall-bin:
@for i in $(INSTALL_BINFILES); do \
rm -f $(PREFIX)/bin/$$i; \
done

install-doc: $(INSTALL_DOCFILES)
ifdef INSTALL_DOCFILES
-$(INSTALL_DATA_DIR) $(PREFIX)/doc/advance
@for i in $(INSTALL_DOCFILES); do \
$(INSTALL_DATA) $$i $(PREFIX)/doc/advance; \
done
endif

install_man: $(INSTALL_MANFILES)
uninstall-doc:
ifdef INSTALL_DOCFILES
@for i in $(INSTALL_DOCFILES); do \
rm -f $(PREFIX)/doc/advance/$$i; \
done
endif

install-man: $(INSTALL_MANFILES)
ifdef INSTALL_MANFILES
-$(INSTALL_MAN_DIR) $(PREFIX)/man/man1
@for i in $(INSTALL_MANFILES); do \
$(INSTALL_DATA) $$i $(PREFIX)/man/man1; \
done
endif

install: install_bin install_data install_doc install_man
uninstall-man:
ifdef INSTALL_MANFILES
@for i in $(INSTALL_MANFILES); do \
rm -f $(PREFIX)/man/man1/$$i; \
done
endif

install: installdirs install-bin install-data install-doc install-man

install-strip: install

uninstall: uninstall-bin uninstall-data uninstall-doc uninstall-man

############################################################################
# Common build
Expand All @@ -293,22 +329,10 @@ RCFLAGS += --include-dir advance/lib
############################################################################
# Special Rules

ARCH_ALL = ARCH=i386 CONF_CFLAGS_ARCH="-march=i386 -DUSE_LSB"
ARCH_PENTIUM = ARCH=i586 CONF_CFLAGS_ARCH="-march=i586 -DUSE_LSB -DUSE_ASM_i586"
ARCH_PENTIUM2 = ARCH=i686 CONF_CFLAGS_ARCH="-march=i686 -DUSE_LSB -DUSE_ASM_i586"
ARCH_K6 = ARCH=k6 CONF_CFLAGS_ARCH="-march=k6 -DUSE_LSB -DUSE_ASM_i586"

dosmame:
$(MAKE) $(ARCH_PENTIUM2) CONF=no CONF_HOST=dos CONF_EMU=mame emu

dosmess:
$(MAKE) $(ARCH_PENTIUM2) CONF=no CONF_HOST=dos CONF_EMU=mess emu

dospac:
$(MAKE) $(ARCH_PENTIUM2) CONF=no CONF_HOST=dos CONF_EMU=pac emu

dosmenu:
$(MAKE) $(ARCH_PENTIUM2) CONF=no CONF_HOST=dos CONF_EMU=mame menu
ARCH_ALL = CONF_ARCH=i386 CONF_CFLAGS_ARCH="-march=i386 -DUSE_LSB"
ARCH_PENTIUM = CONF_ARCH=i586 CONF_CFLAGS_ARCH="-march=i586 -DUSE_LSB -DUSE_ASM_i586"
ARCH_PENTIUM2 = CONF_ARCH=i686 CONF_CFLAGS_ARCH="-march=i686 -DUSE_LSB -DUSE_ASM_i586"
ARCH_K6 = CONF_ARCH=k6 CONF_CFLAGS_ARCH="-march=k6 -DUSE_LSB -DUSE_ASM_i586"

mame:
$(MAKE) CONF=no CONF_EMU=mame emu
Expand All @@ -327,28 +351,28 @@ pacmame:

wholemame:
$(MAKE) CONF=no dist
$(MAKE) $(ARCH_PENTIUM) CONF=no CONF_HOST=dos CONF_MAP=yes distbin
$(MAKE) $(ARCH_PENTIUM2) CONF=no CONF_HOST=dos CONF_MAP=yes distbin
$(MAKE) $(ARCH_K6) CONF=no CONF_HOST=dos CONF_MAP=yes distbin
$(MAKE) $(ARCH_PENTIUM) CONF=no CONF_HOST=dos CONF_MAP=yes CONF_COMPRESS=yes distbin
$(MAKE) $(ARCH_PENTIUM2) CONF=no CONF_HOST=dos CONF_MAP=yes CONF_COMPRESS=yes distbin
$(MAKE) $(ARCH_K6) CONF=no CONF_HOST=dos CONF_MAP=yes CONF_COMPRESS=yes distbin

wholemess:
$(MAKE) CONF=no CONF_EMU=mess dist
$(MAKE) $(ARCH_PENTIUM) CONF=no CONF_HOST=dos CONF_EMU=mess CONF_MAP=yes distbin
$(MAKE) $(ARCH_PENTIUM2) CONF=no CONF_HOST=dos CONF_EMU=mess CONF_MAP=yes distbin
$(MAKE) $(ARCH_K6) CONF=no CONF_HOST=dos CONF_EMU=mess CONF_MAP=yes distbin
$(MAKE) $(ARCH_PENTIUM) CONF=no CONF_HOST=dos CONF_EMU=mess CONF_MAP=yes CONF_COMPRESS=yes distbin
$(MAKE) $(ARCH_PENTIUM2) CONF=no CONF_HOST=dos CONF_EMU=mess CONF_MAP=yes CONF_COMPRESS=yes distbin
$(MAKE) $(ARCH_K6) CONF=no CONF_HOST=dos CONF_EMU=mess CONF_MAP=yes CONF_COMPRESS=yes distbin

wholepac:
$(MAKE) CONF=no CONF_EMU=pac dist
$(MAKE) $(ARCH_PENTIUM) CONF=no CONF_HOST=dos CONF_EMU=pac CONF_MAP=yes distbin
$(MAKE) $(ARCH_PENTIUM2) CONF=no CONF_HOST=dos CONF_EMU=pac CONF_MAP=yes distbin
$(MAKE) $(ARCH_K6) CONF=no CONF_HOST=dos CONF_EMU=pac CONF_MAP=yes distbin
$(MAKE) $(ARCH_PENTIUM) CONF=no CONF_HOST=dos CONF_EMU=pac CONF_MAP=yes CONF_COMPRESS=yes distbin
$(MAKE) $(ARCH_PENTIUM2) CONF=no CONF_HOST=dos CONF_EMU=pac CONF_MAP=yes CONF_COMPRESS=yes distbin
$(MAKE) $(ARCH_K6) CONF=no CONF_HOST=dos CONF_EMU=pac CONF_MAP=yes CONF_COMPRESS=yes distbin

wholemenu:
$(MAKE) CONF=no distmenu
$(MAKE) $(ARCH_PENTIUM) CONF=no CONF_HOST=dos CONF_SYSTEM=dos CONF_MAP=yes distmenubin
$(MAKE) $(ARCH_PENTIUM) CONF=no CONF_HOST=windows CONF_SYSTEM=sdl CONF_MAP=yes distmenubin
$(MAKE) $(ARCH_PENTIUM2) CONF=no CONF_HOST=linux CONF_SYSTEM=sdl CONF_MAP=yes distmenubin
$(MAKE) $(ARCH_PENTIUM2) CONF=no CONF_HOST=linux CONF_SYSTEM=linux CONF_MAP=yes distmenubin
$(MAKE) $(ARCH_PENTIUM) CONF=no CONF_HOST=dos CONF_SYSTEM=dos CONF_MAP=yes CONF_COMPRESS=yes distmenubin
$(MAKE) $(ARCH_PENTIUM) CONF=no CONF_HOST=windows CONF_SYSTEM=sdl CONF_MAP=yes CONF_COMPRESS=yes distmenubin
$(MAKE) $(ARCH_PENTIUM) CONF=no CONF_HOST=linux CONF_SYSTEM=sdl CONF_MAP=yes distmenubin
$(MAKE) $(ARCH_PENTIUM) CONF=no CONF_HOST=linux CONF_SYSTEM=linux CONF_MAP=yes distmenubin

wholecab:
$(MAKE) CONF=no CONF_HOST=dos distcab
Expand All @@ -372,3 +396,4 @@ distmame:
distmamebin:
$(MAKE) CONF=no CONF_EMU=mame distbin


Loading

0 comments on commit 988431a

Please sign in to comment.