From 297834017a56140d1a33a4ce642bc9f39f54cf28 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Fri, 22 Apr 2011 00:29:18 +0200
Subject: WIN32: Embed engine data files and theme files into executable.

This embeds all the engine data files from dists/engine-data into the
executable in case the engines using them are included statically.

Furthermore it includes the theme dist files in the executable.
---
 dists/scummvm.rc    | 43 +++++++++++++++++++++++++++++++++++++++++++
 dists/scummvm.rc.in | 43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 86 insertions(+)

(limited to 'dists')

diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index 15dd04c0d9..203f57aa46 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -1,7 +1,50 @@
 #include "winresrc.h"
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#define FILE 256
+
 #if defined (__MINGW32__) || defined(__CYGWIN32__) || defined(HAS_INCLUDE_SET)
 IDI_ICON               ICON    DISCARDABLE     "icons/scummvm.ico"
+
+scummmodern.zip        FILE    "gui/themes/scummmodern.zip"
+#ifdef USE_TRANSLATION
+translations.dat       FILE    "gui/themes/translations.dat"
+#endif
+
+#if ENABLE_DRASCULA  == STATIC_PLUGIN
+drascula.dat           FILE    "dists/engine-data/drascula.dat"
+#endif
+#if ENABLE_HUGO      == STATIC_PLUGIN
+hugo.dat               FILE    "dists/engine-data/hugo.dat"
+#endif
+#if ENABLE_KYRA      == STATIC_PLUGIN
+kyra.dat               FILE    "dists/engine-data/kyra.dat"
+#endif
+#if ENABLE_LURE      == STATIC_PLUGIN
+lure.dat               FILE    "dists/engine-data/lure.dat"
+#endif
+#if ENABLE_M4        == STATIC_PLUGIN
+m4.dat                 FILE    "dists/engine-data/m4.dat"
+#endif
+#if ENABLE_QUEEN     == STATIC_PLUGIN
+queen.tbl              FILE    "dists/engine-data/queen.tbl"
+#endif
+#if ENABLE_SKY       == STATIC_PLUGIN
+sky.cpt                FILE    "dists/engine-data/sky.cpt"
+#endif
+#if ENABLE_TEENAGENT == STATIC_PLUGIN
+teenagent.dat          FILE    "dists/engine-data/teenagent.dat"
+#endif
+#if ENABLE_TOON      == STATIC_PLUGIN
+toon.dat               FILE    "dists/engine-data/toon.dat"
+#endif
+#if ENABLE_AGI       == STATIC_PLUGIN
+pred.dic               FILE    "dists/pred.dic"
+#endif
+
 #else
 IDI_ICON               ICON    DISCARDABLE     "../../icons/scummvm.ico"
 #endif
diff --git a/dists/scummvm.rc.in b/dists/scummvm.rc.in
index a0fcf82dbb..20e88f1df5 100644
--- a/dists/scummvm.rc.in
+++ b/dists/scummvm.rc.in
@@ -1,7 +1,50 @@
 #include "winresrc.h"
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#define FILE 256
+
 #if defined (__MINGW32__) || defined(__CYGWIN32__) || defined(HAS_INCLUDE_SET)
 IDI_ICON               ICON    DISCARDABLE     "icons/scummvm.ico"
+
+scummmodern.zip        FILE    "gui/themes/scummmodern.zip"
+#ifdef USE_TRANSLATION
+translations.dat       FILE    "gui/themes/translations.dat"
+#endif
+
+#if ENABLE_DRASCULA  == STATIC_PLUGIN
+drascula.dat           FILE    "dists/engine-data/drascula.dat"
+#endif
+#if ENABLE_HUGO      == STATIC_PLUGIN
+hugo.dat               FILE    "dists/engine-data/hugo.dat"
+#endif
+#if ENABLE_KYRA      == STATIC_PLUGIN
+kyra.dat               FILE    "dists/engine-data/kyra.dat"
+#endif
+#if ENABLE_LURE      == STATIC_PLUGIN
+lure.dat               FILE    "dists/engine-data/lure.dat"
+#endif
+#if ENABLE_M4        == STATIC_PLUGIN
+m4.dat                 FILE    "dists/engine-data/m4.dat"
+#endif
+#if ENABLE_QUEEN     == STATIC_PLUGIN
+queen.tbl              FILE    "dists/engine-data/queen.tbl"
+#endif
+#if ENABLE_SKY       == STATIC_PLUGIN
+sky.cpt                FILE    "dists/engine-data/sky.cpt"
+#endif
+#if ENABLE_TEENAGENT == STATIC_PLUGIN
+teenagent.dat          FILE    "dists/engine-data/teenagent.dat"
+#endif
+#if ENABLE_TOON      == STATIC_PLUGIN
+toon.dat               FILE    "dists/engine-data/toon.dat"
+#endif
+#if ENABLE_AGI       == STATIC_PLUGIN
+pred.dic               FILE    "dists/pred.dic"
+#endif
+
 #else
 IDI_ICON               ICON    DISCARDABLE     "../../icons/scummvm.ico"
 #endif
-- 
cgit v1.2.3


From d41c32d363e985f4d5b64795bbccebe976bdd5c4 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Thu, 5 May 2011 20:28:43 +0200
Subject: BUILD: Get rid of old MSVC style win resource support.

---
 dists/scummvm.rc    | 5 -----
 dists/scummvm.rc.in | 5 -----
 2 files changed, 10 deletions(-)

(limited to 'dists')

diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index 203f57aa46..109437305c 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -6,7 +6,6 @@
 
 #define FILE 256
 
-#if defined (__MINGW32__) || defined(__CYGWIN32__) || defined(HAS_INCLUDE_SET)
 IDI_ICON               ICON    DISCARDABLE     "icons/scummvm.ico"
 
 scummmodern.zip        FILE    "gui/themes/scummmodern.zip"
@@ -45,10 +44,6 @@ toon.dat               FILE    "dists/engine-data/toon.dat"
 pred.dic               FILE    "dists/pred.dic"
 #endif
 
-#else
-IDI_ICON               ICON    DISCARDABLE     "../../icons/scummvm.ico"
-#endif
-
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION     1,4,0,0
  PRODUCTVERSION  1,4,0,0
diff --git a/dists/scummvm.rc.in b/dists/scummvm.rc.in
index 20e88f1df5..c043ce1644 100644
--- a/dists/scummvm.rc.in
+++ b/dists/scummvm.rc.in
@@ -6,7 +6,6 @@
 
 #define FILE 256
 
-#if defined (__MINGW32__) || defined(__CYGWIN32__) || defined(HAS_INCLUDE_SET)
 IDI_ICON               ICON    DISCARDABLE     "icons/scummvm.ico"
 
 scummmodern.zip        FILE    "gui/themes/scummmodern.zip"
@@ -45,10 +44,6 @@ toon.dat               FILE    "dists/engine-data/toon.dat"
 pred.dic               FILE    "dists/pred.dic"
 #endif
 
-#else
-IDI_ICON               ICON    DISCARDABLE     "../../icons/scummvm.ico"
-#endif
-
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION     @VER_MAJOR@,@VER_MINOR@,@VER_PATCH@,0
  PRODUCTVERSION  @VER_MAJOR@,@VER_MINOR@,@VER_PATCH@,0
-- 
cgit v1.2.3