[Vice-emu-commit] SF.net SVN: vice-emu:[19089] branches/viceplus/v2.0-x64dtv/vice

Revision: 19089
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19089&view=rev
Author:   blackystardust
Date:     2008-07-31 16:44:15 +0000 (Thu, 31 Jul 2008)

Log Message:
-----------
Added an x64dtv executable build prevention for the riscos and gp2x ports.

Modified Paths:
--------------
    branches/viceplus/v2.0-x64dtv/vice/Makefile.am
    branches/viceplus/v2.0-x64dtv/vice/configure.in
    branches/viceplus/v2.0-x64dtv/vice/src/Makefile.am

Modified: branches/viceplus/v2.0-x64dtv/vice/Makefile.am
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/Makefile.am	2008-07-31 11:21:37 UTC (rev 19088)
+++ branches/viceplus/v2.0-x64dtv/vice/Makefile.am	2008-07-31 16:44:15 UTC (rev 19089)
@@ -18,8 +18,10 @@
 x128:
 	(cd src; $(MAKE) x128-all)
 
+if SUPPORT_X64DTV
 x64dtv:
 	(cd src; $(MAKE) x64dtv-all)
+endif
 
 xvic:
 	(cd src; $(MAKE) xvic-all)

Modified: branches/viceplus/v2.0-x64dtv/vice/configure.in
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/configure.in	2008-07-31 11:21:37 UTC (rev 19088)
+++ branches/viceplus/v2.0-x64dtv/vice/configure.in	2008-07-31 16:44:15 UTC (rev 19089)
@@ -1830,6 +1830,16 @@
 AC_SUBST(XCBM2_WINRES)
 
 
+if test x"$is_unix_gp2x" = "xyes" ; then
+  AM_CONDITIONAL(SUPPORT_X64DTV, false)
+else
+  if test x"$is_riscos" = "xyes"; then
+    AM_CONDITIONAL(SUPPORT_X64DTV, false)
+  else
+    AM_CONDITIONAL(SUPPORT_X64DTV, true)
+  fi
+fi
+
 dnl Setup the system-specific object files.
 if test x"$is_unix" = "xyes"; then
   ARCH_DIR="\$(top_builddir)/src/arch/unix"

Modified: branches/viceplus/v2.0-x64dtv/vice/src/Makefile.am
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/Makefile.am	2008-07-31 11:21:37 UTC (rev 19088)
+++ branches/viceplus/v2.0-x64dtv/vice/src/Makefile.am	2008-07-31 16:44:15 UTC (rev 19089)
@@ -351,7 +351,11 @@
 realdevice_lib =
 endif
 
+if SUPPORT_X64DTV
 bin_PROGRAMS = x64 x128 x64dtv xvic xpet xplus4 xcbm2 c1541 petcat cartconv
+else
+bin_PROGRAMS = x64 x128 xvic xpet xplus4 xcbm2 c1541 petcat cartconv
+endif
 
 EXTRA_PROGRAMS =
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.