[Scummvm-cvs-logs] SF.net SVN: scummvm:[41644] scummvm/trunk

[dhewg at users.sourceforge.net]

Revision: 41644
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41644&view=rev
Author:   dhewg
Date:     2009-06-18 19:39:12 +0000 (Thu, 18 Jun 2009)

Log Message:
-----------
added pred.dic to DIST_FILES_ENGINEDATA

Modified Paths:
--------------
    scummvm/trunk/Makefile.common
    scummvm/trunk/ports.mk

Modified: scummvm/trunk/Makefile.common
===================================================================
--- scummvm/trunk/Makefile.common	2009-06-18 19:04:13 UTC (rev 41643)
+++ scummvm/trunk/Makefile.common	2009-06-18 19:39:12 UTC (rev 41644)
@@ -238,6 +238,11 @@
 endif
 DIST_FILES_ENGINEDATA:=$(addprefix $(srcdir)/dists/engine-data/,$(DIST_FILES_ENGINEDATA))
 
+# pred.dic is currently only used for the AGI engine
+ifdef ENABLE_AGI
+DIST_FILES_ENGINEDATA+=$(srcdir)/dists/pred.dic
+endif
+
 # Plugin files
 DIST_FILES_PLUGINS:=$(addprefix $(srcdir)/,$(PLUGINS))
 

Modified: scummvm/trunk/ports.mk
===================================================================
--- scummvm/trunk/ports.mk	2009-06-18 19:04:13 UTC (rev 41643)
+++ scummvm/trunk/ports.mk	2009-06-18 19:39:12 UTC (rev 41644)
@@ -48,7 +48,6 @@
 	echo "APPL????" > $(bundle_name)/Contents/PkgInfo
 	cp $(srcdir)/dists/macosx/Info.plist $(bundle_name)/Contents/
 	cp $(srcdir)/icons/scummvm.icns $(bundle_name)/Contents/Resources/
-	cp $(srcdir)/dists/pred.dic $(bundle_name)/Contents/Resources/
 	cp $(DIST_FILES_DOCS) $(bundle_name)/
 	cp $(DIST_FILES_THEMES) $(bundle_name)/Contents/Resources/
 	cp $(DIST_FILES_ENGINEDATA) $(bundle_name)/Contents/Resources/
@@ -61,7 +60,6 @@
 iphonebundle: iphone $(srcdir)/dists/iphone/Info.plist
 	mkdir -p $(bundle_name)
 	cp $(srcdir)/dists/iphone/Info.plist $(bundle_name)/
-	cp $(srcdir)/dists/pred.dic $(bundle_name)/
 	cp $(DIST_FILES_DOCS) $(bundle_name)/
 	cp $(DIST_FILES_THEMES) $(bundle_name)/
 	cp $(DIST_FILES_ENGINEDATA) $(bundle_name)/
@@ -154,7 +152,6 @@
 win32dist: $(EXECUTABLE)
 	mkdir -p $(WIN32PATH)
 	$(STRIP) $(EXECUTABLE) -o $(WIN32PATH)/$(EXECUTABLE)
-	cp $(srcdir)/dists/pred.dic $(WIN32PATH)
 	cp $(DIST_FILES_THEMES) $(WIN32PATH)
 	cp $(DIST_FILES_ENGINEDATA) $(WIN32PATH)
 	cp $(srcdir)/AUTHORS $(WIN32PATH)/AUTHORS.txt
@@ -178,7 +175,6 @@
 	cp icons/scummvm.info $(AOS4PATH)/$(EXECUTABLE)_SVN.info
 	cp $(DIST_FILES_THEMES) $(AOS4PATH)/themes/
 	cp $(DIST_FILES_ENGINEDATA) $(AOS4PATH)/extras/
-	cp $(srcdir)/dists/pred.dic $(AOS4PATH)/extras/
 	cp $(srcdir)/AUTHORS $(AOS4PATH)/AUTHORS.txt
 	cp $(srcdir)/COPYING $(AOS4PATH)/COPYING.txt
 	cp $(srcdir)/COPYING.LGPL $(AOS4PATH)/COPYING.LGPL.txt
@@ -202,7 +198,6 @@
 endif
 	sed 's/$$/\r/' < $(srcdir)/dists/wii/READMII > wiidist/scummvm/READMII.txt
 	for i in $(DIST_FILES_DOCS); do sed 's/$$/\r/' < $$i > wiidist/scummvm/`basename $$i`.txt; done
-	$(CP) $(srcdir)/dists/pred.dic wiidist/scummvm/
 	$(CP) $(DIST_FILES_THEMES) wiidist/scummvm/
 ifneq ($(DIST_FILES_ENGINEDATA),)
 	$(CP) $(DIST_FILES_ENGINEDATA) wiidist/scummvm/


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