From c441c5261ff3e6ad114c0384ef818b942655f3a6 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Wed, 23 Jul 2008 09:02:47 +0000 Subject: Added Tinsel engine to main repos (no news item for it ON PURPOSE) svn-id: r33230 --- dists/msvc8/tinsel.vcproj | 502 +++++++++++++++++++++++++++++++++++++++++++++ dists/msvc9/tinsel.vcproj | 503 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1005 insertions(+) create mode 100644 dists/msvc8/tinsel.vcproj create mode 100644 dists/msvc9/tinsel.vcproj (limited to 'dists') diff --git a/dists/msvc8/tinsel.vcproj b/dists/msvc8/tinsel.vcproj new file mode 100644 index 0000000000..48eb5bbbe5 --- /dev/null +++ b/dists/msvc8/tinsel.vcproj @@ -0,0 +1,502 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dists/msvc9/tinsel.vcproj b/dists/msvc9/tinsel.vcproj new file mode 100644 index 0000000000..aca1a82ab8 --- /dev/null +++ b/dists/msvc9/tinsel.vcproj @@ -0,0 +1,503 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 1f44cba3ee52029b0511a436190eadc3f548472a Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Wed, 23 Jul 2008 09:28:23 +0000 Subject: Replaced the out of date file list in the MSVC8 project with the proper file list svn-id: r33231 --- dists/msvc8/tinsel.vcproj | 34 +++++++++------------------------- 1 file changed, 9 insertions(+), 25 deletions(-) (limited to 'dists') diff --git a/dists/msvc8/tinsel.vcproj b/dists/msvc8/tinsel.vcproj index 48eb5bbbe5..cb6ba0c2e8 100644 --- a/dists/msvc8/tinsel.vcproj +++ b/dists/msvc8/tinsel.vcproj @@ -1,7 +1,7 @@ - - - - - - @@ -216,6 +204,10 @@ RelativePath="..\..\engines\tinsel\config.h" > + + @@ -236,18 +228,10 @@ RelativePath="..\..\engines\tinsel\detection.cpp" > - - - - @@ -268,10 +252,6 @@ RelativePath="..\..\engines\tinsel\faders.h" > - - @@ -292,6 +272,10 @@ RelativePath="..\..\engines\tinsel\graphics.h" > + + -- cgit v1.2.3 From 265ef07ef8d0b3ba415476806fdb216b8dba0d10 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Wed, 23 Jul 2008 09:37:15 +0000 Subject: Added the Tinsel engine to the Scummvm MSVC8 Solution svn-id: r33232 --- dists/msvc8/scummvm.sln | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'dists') diff --git a/dists/msvc8/scummvm.sln b/dists/msvc8/scummvm.sln index d3621cbe45..8138c77a2b 100644 --- a/dists/msvc8/scummvm.sln +++ b/dists/msvc8/scummvm.sln @@ -61,6 +61,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m4", "m4.vcproj", "{6D576A2 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "made", "made.vcproj", "{E29B5D40-08F7-11DD-BD0B-0800200C9A66}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinsel", "tinsel.vcproj", "{22AA7760-2C91-11DD-BD0B-0800200C9A66}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -147,6 +149,10 @@ Global {E29B5D40-08F7-11DD-BD0B-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 {E29B5D40-08F7-11DD-BD0B-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 {E29B5D40-08F7-11DD-BD0B-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {22AA7760-2C91-11DD-BD0B-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {22AA7760-2C91-11DD-BD0B-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {22AA7760-2C91-11DD-BD0B-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {22AA7760-2C91-11DD-BD0B-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE -- cgit v1.2.3 From f2919e735ab83544008a22a540cca9d7887dc6cd Mon Sep 17 00:00:00 2001 From: Kari Salminen Date: Wed, 23 Jul 2008 09:45:44 +0000 Subject: Updated rest of the MSVC project and solution files for Tinsel. svn-id: r33233 --- dists/msvc7/scummvm.sln | 6 ++++++ dists/msvc71/scummvm.sln | 8 ++++++++ dists/msvc9/scummvm.sln | 6 ++++++ dists/msvc9/tinsel.vcproj | 34 +++++++++------------------------- 4 files changed, 29 insertions(+), 25 deletions(-) (limited to 'dists') diff --git a/dists/msvc7/scummvm.sln b/dists/msvc7/scummvm.sln index e754435a8f..24880538c6 100644 --- a/dists/msvc7/scummvm.sln +++ b/dists/msvc7/scummvm.sln @@ -60,6 +60,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m4", "m4.vcproj", "{6D576A2 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "made", "made.vcproj", "{E29B5D40-08F7-11DD-BD0B-0800200C9A66}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinsel", "tinsel.vcproj", "{22AA7760-2C91-11DD-BD0B-0800200C9A66}" +EndProject Global GlobalSection(SolutionConfiguration) = preSolution Debug = Debug @@ -146,6 +148,10 @@ Global {E29B5D40-08F7-11DD-BD0B-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 {E29B5D40-08F7-11DD-BD0B-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 {E29B5D40-08F7-11DD-BD0B-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {22AA7760-2C91-11DD-BD0B-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {22AA7760-2C91-11DD-BD0B-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {22AA7760-2C91-11DD-BD0B-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {22AA7760-2C91-11DD-BD0B-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/dists/msvc71/scummvm.sln b/dists/msvc71/scummvm.sln index 71bd6a9219..0845fb04ba 100644 --- a/dists/msvc71/scummvm.sln +++ b/dists/msvc71/scummvm.sln @@ -98,6 +98,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "made", "made.vcproj", "{E29 ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinsel", "tinsel.vcproj", "{22AA7760-2C91-11DD-BD0B-0800200C9A66}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject Global GlobalSection(SolutionConfiguration) = preSolution Debug = Debug @@ -184,6 +188,10 @@ Global {E29B5D40-08F7-11DD-BD0B-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 {E29B5D40-08F7-11DD-BD0B-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 {E29B5D40-08F7-11DD-BD0B-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {22AA7760-2C91-11DD-BD0B-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {22AA7760-2C91-11DD-BD0B-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {22AA7760-2C91-11DD-BD0B-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {22AA7760-2C91-11DD-BD0B-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/dists/msvc9/scummvm.sln b/dists/msvc9/scummvm.sln index a880f0acb6..72bfaaa8c4 100644 --- a/dists/msvc9/scummvm.sln +++ b/dists/msvc9/scummvm.sln @@ -61,6 +61,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m4", "m4.vcproj", "{6D576A2 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "made", "made.vcproj", "{E29B5D40-08F7-11DD-BD0B-0800200C9A66}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinsel", "tinsel.vcproj", "{22AA7760-2C91-11DD-BD0B-0800200C9A66}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -147,6 +149,10 @@ Global {E29B5D40-08F7-11DD-BD0B-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 {E29B5D40-08F7-11DD-BD0B-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 {E29B5D40-08F7-11DD-BD0B-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {22AA7760-2C91-11DD-BD0B-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {22AA7760-2C91-11DD-BD0B-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {22AA7760-2C91-11DD-BD0B-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {22AA7760-2C91-11DD-BD0B-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/dists/msvc9/tinsel.vcproj b/dists/msvc9/tinsel.vcproj index aca1a82ab8..7623290e80 100644 --- a/dists/msvc9/tinsel.vcproj +++ b/dists/msvc9/tinsel.vcproj @@ -1,7 +1,7 @@ - - - - - - @@ -217,6 +205,10 @@ RelativePath="..\..\engines\tinsel\config.h" > + + @@ -237,18 +229,10 @@ RelativePath="..\..\engines\tinsel\detection.cpp" > - - - - @@ -269,10 +253,6 @@ RelativePath="..\..\engines\tinsel\faders.h" > - - @@ -293,6 +273,10 @@ RelativePath="..\..\engines\tinsel\graphics.h" > + + -- cgit v1.2.3 From 0ff328d4aec4274e8a2dff0701eb8ed1e26df494 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Wed, 23 Jul 2008 10:54:59 +0000 Subject: Added extra defines and include for Tinsel project svn-id: r33238 --- dists/msvc8/scummvm.vcproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'dists') diff --git a/dists/msvc8/scummvm.vcproj b/dists/msvc8/scummvm.vcproj index b144dc0b79..8b10a22eb6 100644 --- a/dists/msvc8/scummvm.vcproj +++ b/dists/msvc8/scummvm.vcproj @@ -42,7 +42,7 @@ AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" Optimization="0" AdditionalIncludeDirectories="../..;../../engines" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_NASM;USE_MT32EMU;ENABLE_AGI;ENABLE_AGOS;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_NASM;USE_MT32EMU;ENABLE_AGI;ENABLE_AGOS;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL" MinimalRebuild="true" ExceptionHandling="1" BasicRuntimeChecks="3" @@ -68,7 +68,7 @@ /> + + + + diff --git a/dists/msvc71/parallaction.vcproj b/dists/msvc71/parallaction.vcproj index 6030b030a8..c72fb68234 100644 --- a/dists/msvc71/parallaction.vcproj +++ b/dists/msvc71/parallaction.vcproj @@ -161,6 +161,12 @@ + + + + diff --git a/dists/msvc8/parallaction.vcproj b/dists/msvc8/parallaction.vcproj index c5721bd30f..e268fe1e6b 100644 --- a/dists/msvc8/parallaction.vcproj +++ b/dists/msvc8/parallaction.vcproj @@ -228,6 +228,14 @@ RelativePath="..\..\engines\parallaction\graphics.h" > + + + + diff --git a/dists/msvc9/parallaction.vcproj b/dists/msvc9/parallaction.vcproj index d3117b6b0c..f901976c37 100644 --- a/dists/msvc9/parallaction.vcproj +++ b/dists/msvc9/parallaction.vcproj @@ -229,6 +229,14 @@ RelativePath="..\..\engines\parallaction\graphics.h" > + + + + -- cgit v1.2.3 From bc0ec3f6d8e4f949dddb2a385db2b07804e083c7 Mon Sep 17 00:00:00 2001 From: Kari Salminen Date: Thu, 31 Jul 2008 11:16:48 +0000 Subject: Update MSVC project files for Kyra Lands of Lore additions. svn-id: r33466 --- dists/msvc7/kyra.vcproj | 12 ++++++++++++ dists/msvc71/kyra.vcproj | 12 ++++++++++++ dists/msvc8/kyra.vcproj | 16 ++++++++++++++++ dists/msvc9/kyra.vcproj | 16 ++++++++++++++++ 4 files changed, 56 insertions(+) (limited to 'dists') diff --git a/dists/msvc7/kyra.vcproj b/dists/msvc7/kyra.vcproj index d547288d21..2e0e8669e9 100644 --- a/dists/msvc7/kyra.vcproj +++ b/dists/msvc7/kyra.vcproj @@ -192,6 +192,12 @@ + + + + @@ -243,6 +249,12 @@ + + + + diff --git a/dists/msvc71/kyra.vcproj b/dists/msvc71/kyra.vcproj index f37b1d85fc..efc37c251e 100644 --- a/dists/msvc71/kyra.vcproj +++ b/dists/msvc71/kyra.vcproj @@ -206,6 +206,12 @@ + + + + @@ -257,6 +263,12 @@ + + + + diff --git a/dists/msvc8/kyra.vcproj b/dists/msvc8/kyra.vcproj index c99abdc5bc..00f7749f4d 100644 --- a/dists/msvc8/kyra.vcproj +++ b/dists/msvc8/kyra.vcproj @@ -288,6 +288,14 @@ RelativePath="..\..\engines\kyra\kyra_v2.h" > + + + + @@ -356,6 +364,14 @@ RelativePath="..\..\engines\kyra\screen_lok.h" > + + + + diff --git a/dists/msvc9/kyra.vcproj b/dists/msvc9/kyra.vcproj index f56a2733b5..ba1b9eb949 100644 --- a/dists/msvc9/kyra.vcproj +++ b/dists/msvc9/kyra.vcproj @@ -289,6 +289,14 @@ RelativePath="..\..\engines\kyra\kyra_v2.h" > + + + + @@ -357,6 +365,14 @@ RelativePath="..\..\engines\kyra\screen_lok.h" > + + + + -- cgit v1.2.3 From 4c74db446385611a158efcdab67a27107d8b20aa Mon Sep 17 00:00:00 2001 From: Florian Kagerer Date: Sat, 2 Aug 2008 23:11:31 +0000 Subject: add non-interactive lol demo svn-id: r33556 --- dists/engine-data/kyra.dat | Bin 236767 -> 237913 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'dists') diff --git a/dists/engine-data/kyra.dat b/dists/engine-data/kyra.dat index 7171707e8b..b5861e1e29 100644 Binary files a/dists/engine-data/kyra.dat and b/dists/engine-data/kyra.dat differ -- cgit v1.2.3 From 5ae93cb1080644e8b4643bcf4d3790a0ec69ace1 Mon Sep 17 00:00:00 2001 From: Florian Kagerer Date: Sun, 3 Aug 2008 12:09:48 +0000 Subject: add support for HOF Italian fan translation to kyra.dat svn-id: r33578 --- dists/engine-data/kyra.dat | Bin 237913 -> 240402 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'dists') diff --git a/dists/engine-data/kyra.dat b/dists/engine-data/kyra.dat index b5861e1e29..3aab4e5aff 100644 Binary files a/dists/engine-data/kyra.dat and b/dists/engine-data/kyra.dat differ -- cgit v1.2.3 From eec2a0137dff261e4a43d12eeb4cc1f0d1d66831 Mon Sep 17 00:00:00 2001 From: Florian Kagerer Date: Sun, 3 Aug 2008 12:50:56 +0000 Subject: fix last commit (invalid kyra.dat game features for HOFCD) svn-id: r33580 --- dists/engine-data/kyra.dat | Bin 240402 -> 240402 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'dists') diff --git a/dists/engine-data/kyra.dat b/dists/engine-data/kyra.dat index 3aab4e5aff..5cb5373f45 100644 Binary files a/dists/engine-data/kyra.dat and b/dists/engine-data/kyra.dat differ -- cgit v1.2.3