[Scummvm-cvs-logs] SF.net SVN: scummvm: [27944] tools/branches/gsoc2007-decompiler

[brixxie at users.sourceforge.net]

Revision: 27944
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27944&view=rev
Author:   brixxie
Date:     2007-07-06 10:58:57 -0700 (Fri, 06 Jul 2007)

Log Message:
-----------
Added Makefile entry for antipasto, added `main' method for testing from cmd line

Modified Paths:
--------------
    tools/branches/gsoc2007-decompiler/Makefile
    tools/branches/gsoc2007-decompiler/antipasto.scm

Property Changed:
----------------
    tools/branches/gsoc2007-decompiler/


Property changes on: tools/branches/gsoc2007-decompiler
___________________________________________________________________
Name: svk:merge
   - 489ca303-0d3d-4dc1-a57d-017c7912a06a:/local/gsoc2007-decompiler:32
   + 489ca303-0d3d-4dc1-a57d-017c7912a06a:/local/gsoc2007-decompiler:33

Modified: tools/branches/gsoc2007-decompiler/Makefile
===================================================================
--- tools/branches/gsoc2007-decompiler/Makefile	2007-07-06 17:58:45 UTC (rev 27943)
+++ tools/branches/gsoc2007-decompiler/Makefile	2007-07-06 17:58:57 UTC (rev 27944)
@@ -19,6 +19,7 @@
 	dekyra$(EXEEXT) \
 	descumm$(EXEEXT) \
 	desword2$(EXEEXT) \
+	antipasto$(EXEEXT)
 
 all: $(TARGETS)
 
@@ -31,33 +32,9 @@
 desword2$(EXEEXT): desword2.o util.o
 	$(CXX) $(LDFLAGS) -o $@ $+
 
-encode_dxa$(EXEEXT): encode_dxa.o compress.o util.o
-	$(CXX) $(LDFLAGS) -o $@ $+ -lpng -lz
+antipasto$(EXEEXT): antipasto.scm util.scm
+	csc $< -o $@ -postlude [main]
 
-extract_agos$(EXEEXT): extract_agos.o
-	$(CC) $(LDFLAGS) -o $@ $+
-
-extract_kyra$(EXEEXT): extract_kyra.o kyra_pak.o util.o
-	$(CXX) $(LDFLAGS) -o $@ $+
-
-extract_loom_tg16$(EXEEXT): extract_loom_tg16.o util.o
-	$(CC) $(LDFLAGS) -o $@ $+
-
-extract_mm_apple$(EXEEXT): extract_mm_apple.o util.o
-	$(CC) $(LDFLAGS) -o $@ $+
-
-extract_mm_c64$(EXEEXT): extract_mm_c64.o util.o
-	$(CC) $(LDFLAGS) -o $@ $+
-
-extract_mm_nes$(EXEEXT): extract_mm_nes.o util.o
-	$(CC) $(LDFLAGS) -o $@ $+
-
-extract_scumm_mac$(EXEEXT): extract_scumm_mac.o util.o
-	$(CC) $(LDFLAGS) -o $@ $+
-
-extract_zak_c64$(EXEEXT): extract_zak_c64.o util.o
-	$(CC) $(LDFLAGS) -o $@ $+
-
 descumm.o descumm6.o descumm-common.o descumm-tool.o: descumm.h
 
 descumm.o descumm6.o descumm-common.o descumm-tool.o \

Modified: tools/branches/gsoc2007-decompiler/antipasto.scm
===================================================================
--- tools/branches/gsoc2007-decompiler/antipasto.scm	2007-07-06 17:58:45 UTC (rev 27943)
+++ tools/branches/gsoc2007-decompiler/antipasto.scm	2007-07-06 17:58:57 UTC (rev 27944)
@@ -2,7 +2,7 @@
 
 ;;; Antipasto - Scumm Script Disassembler Prototype (version 5 scripts)
 ;;; Copyright (C) 2007 Andreas Scholta
-;;; Time-stamp: <2007-07-05 19:06:17 brx>
+;;; Time-stamp: <2007-07-06 19:46:51 brx>
 
 ;;; This program is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU General Public License
@@ -807,13 +807,8 @@
                            (decode-ops (cons decoded-op decoded))
                            (reverse decoded)))))
 
-(define (test-run)
-  (set! current-script-file
-;; "/home/brx/code/gsoc2007-decompiler/M1.scummV5/81.cu_bar_2.0092"
-"/home/brx/code/gsoc2007-decompiler/M2.scummV5/entry-4.dmp"
-;; "/home/brx/code/gsoc2007-decompiler/M2.scummV5/room-15-203.dmp";
-;; "/home/brx/code/gsoc2007-decompiler/M1.scummV5/01.beach.0201"
-        )
+(define (test-run file)
+  (set! current-script-file file)
   (set! current-script-port (open-input-file current-script-file))
   (set! current-script-offset 0)
   (parse-header)
@@ -831,3 +826,14 @@
   (set! current-script-port #f)
   (set! current-script-file #f)
   (set! current-script-offset #f))
+
+;; (test-run "/home/brx/code/gsoc2007-decompiler/M1.scummV5/81.cu_bar_2.0092")
+;; (test-run "/home/brx/code/gsoc2007-decompiler/M2.scummV5/entry-4.dmp")
+;; (test-run "/home/brx/code/gsoc2007-decompiler/M2.scummV5/room-15-203.dmp");
+;; (test-run "/home/brx/code/gsoc2007-decompiler/M1.scummV5/01.beach.0201")
+
+(define (main)
+  (if (= (length (argv)) 2)
+      (test-run (cadr (argv)))
+      (printf "Usage: ~A <scummV5 script>~%"
+              (car (argv)))))


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