Ticket #8649: cruise.dif

File cruise.dif, 17.4 KB (added by SF/quietust, 14 years ago)

Cruise project file, plus fixes to allow building again

Line 
1Index: dists/msvc71/scummvm.sln
2===================================================================
3--- dists/msvc71/scummvm.sln (revision 26637)
4+++ dists/msvc71/scummvm.sln (working copy)
5@@ -4,6 +4,7 @@
6 {43C2D921-FEE3-40BE-B58A-A6CA34235731} = {43C2D921-FEE3-40BE-B58A-A6CA34235731}
7 {6CC3E421-779D-4E80-8100-520886A0F9FF} = {6CC3E421-779D-4E80-8100-520886A0F9FF}
8 {AA83E230-EC4A-44DF-896C-4472F20CE168} = {AA83E230-EC4A-44DF-896C-4472F20CE168}
9+ {CD9AEE36-CEBD-40CE-A6B3-B71523AB8DEC} = {CD9AEE36-CEBD-40CE-A6B3-B71523AB8DEC}
10 {C8AAE83E-198B-4ECA-A877-166827953979} = {C8AAE83E-198B-4ECA-A877-166827953979}
11 {B6AFD548-63D2-40CD-A652-E87095AFCBAF} = {B6AFD548-63D2-40CD-A652-E87095AFCBAF}
12 {B5527758-2F51-4CCD-AAE1-B0E28654BD6A} = {B5527758-2F51-4CCD-AAE1-B0E28654BD6A}
13@@ -73,6 +74,10 @@
14 ProjectSection(ProjectDependencies) = postProject
15 EndProjectSection
16 EndProject
17+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cruise", "cruise.vcproj", "{CD9AEE36-CEBD-40CE-A6B3-B71523AB8DEC}"
18+ ProjectSection(ProjectDependencies) = postProject
19+ EndProjectSection
20+EndProject
21 Global
22 GlobalSection(SolutionConfiguration) = preSolution
23 Debug = Debug
24@@ -141,6 +146,10 @@
25 {0068957B-E2E1-4988-8C87-D541D84DAF20}.Debug.Build.0 = Debug|Win32
26 {0068957B-E2E1-4988-8C87-D541D84DAF20}.Release.ActiveCfg = Release|Win32
27 {0068957B-E2E1-4988-8C87-D541D84DAF20}.Release.Build.0 = Release|Win32
28+ {CD9AEE36-CEBD-40CE-A6B3-B71523AB8DEC}.Debug.ActiveCfg = Debug|Win32
29+ {CD9AEE36-CEBD-40CE-A6B3-B71523AB8DEC}.Debug.Build.0 = Debug|Win32
30+ {CD9AEE36-CEBD-40CE-A6B3-B71523AB8DEC}.Release.ActiveCfg = Release|Win32
31+ {CD9AEE36-CEBD-40CE-A6B3-B71523AB8DEC}.Release.Build.0 = Release|Win32
32 EndGlobalSection
33 GlobalSection(ExtensibilityGlobals) = postSolution
34 EndGlobalSection
35Index: dists/msvc71/scumm.vcproj
36===================================================================
37--- dists/msvc71/scumm.vcproj (revision 26637)
38+++ dists/msvc71/scumm.vcproj (working copy)
39@@ -390,6 +390,15 @@
40 RelativePath="..\..\engines\scumm\debugger.h">
41 </File>
42 <File
43+ RelativePath="..\..\engines\scumm\detection.cpp">
44+ </File>
45+ <File
46+ RelativePath="..\..\engines\scumm\detection.h">
47+ </File>
48+ <File
49+ RelativePath="..\..\engines\scumm\detection_tables.h">
50+ </File>
51+ <File
52 RelativePath="..\..\engines\scumm\dialogs.cpp">
53 </File>
54 <File
55@@ -480,12 +489,6 @@
56 RelativePath="..\..\engines\scumm\player_v3a.h">
57 </File>
58 <File
59- RelativePath="..\..\engines\scumm\plugin.cpp">
60- </File>
61- <File
62- RelativePath="..\..\engines\scumm\plugin.h">
63- </File>
64- <File
65 RelativePath="..\..\engines\scumm\resource.cpp">
66 </File>
67 <File
68Index: dists/msvc71/scummvm.vcproj
69===================================================================
70--- dists/msvc71/scummvm.vcproj (revision 26637)
71+++ dists/msvc71/scummvm.vcproj (working copy)
72@@ -38,7 +38,7 @@
73 Name="VCCustomBuildTool"/>
74 <Tool
75 Name="VCLinkerTool"
76- AdditionalDependencies="winmm.lib sdl.lib zdll.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib agi_debug/agi.lib cine_debug/cine.lib gob_debug/gob.lib kyra_debug/kyra.lib lure_debug/lure.lib queen_debug/queen.lib saga_debug/saga.lib scumm_debug/scumm.lib agos_debug/agos.lib sky_debug/sky.lib sword1_debug/sword1.lib sword2_debug/sword2.lib touche_debug/touche.lib parallaction_debug/parallaction.lib"
77+ AdditionalDependencies="winmm.lib sdl.lib zdll.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib agi_debug/agi.lib cine_debug/cine.lib gob_debug/gob.lib kyra_debug/kyra.lib lure_debug/lure.lib queen_debug/queen.lib saga_debug/saga.lib scumm_debug/scumm.lib agos_debug/agos.lib sky_debug/sky.lib sword1_debug/sword1.lib sword2_debug/sword2.lib touche_debug/touche.lib parallaction_debug/parallaction.lib cruise_debug/cruise.lib"
78 OutputFile="$(OutDir)/scummvm.exe"
79 LinkIncremental="2"
80 IgnoreDefaultLibraryNames="libcmtd.lib"
81@@ -97,7 +97,7 @@
82 Name="VCCustomBuildTool"/>
83 <Tool
84 Name="VCLinkerTool"
85- AdditionalDependencies="winmm.lib sdl.lib zdll.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib agi_release/agi.lib cine_release/cine.lib gob_release/gob.lib kyra_release/kyra.lib lure_release/lure.lib queen_release/queen.lib saga_release/saga.lib scumm_release/scumm.lib agos_release/agos.lib sky_release/sky.lib sword1_release/sword1.lib sword2_release/sword2.lib touche_release/touche.lib parallaction_release/parallaction.lib"
86+ AdditionalDependencies="winmm.lib sdl.lib zdll.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib agi_release/agi.lib cine_release/cine.lib gob_release/gob.lib kyra_release/kyra.lib lure_release/lure.lib queen_release/queen.lib saga_release/saga.lib scumm_release/scumm.lib agos_release/agos.lib sky_release/sky.lib sword1_release/sword1.lib sword2_release/sword2.lib touche_release/touche.lib parallaction_release/parallaction.lib cruise_release/cruise.lib"
87 OutputFile="$(OutDir)/scummvm.exe"
88 LinkIncremental="1"
89 SuppressStartupBanner="TRUE"
90Index: dists/msvc71/touche.vcproj
91===================================================================
92--- dists/msvc71/touche.vcproj (revision 26637)
93+++ dists/msvc71/touche.vcproj (working copy)
94@@ -110,6 +110,9 @@
95 </References>
96 <Files>
97 <File
98+ RelativePath="..\..\engines\touche\detection.cpp">
99+ </File>
100+ <File
101 RelativePath="..\..\engines\touche\graphics.cpp">
102 </File>
103 <File
104@@ -125,9 +128,6 @@
105 RelativePath="..\..\engines\touche\opcodes.cpp">
106 </File>
107 <File
108- RelativePath="..\..\engines\touche\plugin.cpp">
109- </File>
110- <File
111 RelativePath="..\..\engines\touche\resource.cpp">
112 </File>
113 <File
114Index: dists/msvc71/agos.vcproj
115===================================================================
116--- dists/msvc71/agos.vcproj (revision 26637)
117+++ dists/msvc71/agos.vcproj (working copy)
118@@ -144,15 +144,18 @@
119 RelativePath="..\..\engines\agos\debugger.h">
120 </File>
121 <File
122+ RelativePath="..\..\engines\agos\detection.cpp">
123+ </File>
124+ <File
125+ RelativePath="..\..\engines\agos\detection_tables.h">
126+ </File>
127+ <File
128 RelativePath="..\..\engines\agos\draw.cpp">
129 </File>
130 <File
131 RelativePath="..\..\engines\agos\event.cpp">
132 </File>
133 <File
134- RelativePath="..\..\engines\agos\game.cpp">
135- </File>
136- <File
137 RelativePath="..\..\engines\agos\gfx.cpp">
138 </File>
139 <File
140Index: dists/msvc71/cruise.vcproj
141===================================================================
142--- dists/msvc71/cruise.vcproj (revision 0)
143+++ dists/msvc71/cruise.vcproj (revision 0)
144@@ -0,0 +1,287 @@
145+<?xml version="1.0" encoding="Windows-1250"?>
146+<VisualStudioProject
147+ ProjectType="Visual C++"
148+ Version="7.10"
149+ Name="cruise"
150+ ProjectGUID="{CD9AEE36-CEBD-40CE-A6B3-B71523AB8DEC}"
151+ Keyword="Win32Proj">
152+ <Platforms>
153+ <Platform
154+ Name="Win32"/>
155+ </Platforms>
156+ <Configurations>
157+ <Configuration
158+ Name="Debug|Win32"
159+ OutputDirectory="cruise_Debug"
160+ IntermediateDirectory="cruise_Debug"
161+ ConfigurationType="4"
162+ CharacterSet="2">
163+ <Tool
164+ Name="VCCLCompilerTool"
165+ AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
166+ Optimization="0"
167+ AdditionalIncludeDirectories="../..;../../engines"
168+ PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
169+ MinimalRebuild="TRUE"
170+ ExceptionHandling="TRUE"
171+ BasicRuntimeChecks="3"
172+ RuntimeLibrary="1"
173+ BufferSecurityCheck="TRUE"
174+ EnableFunctionLevelLinking="TRUE"
175+ ForceConformanceInForLoopScope="TRUE"
176+ UsePrecompiledHeader="0"
177+ WarningLevel="4"
178+ SuppressStartupBanner="FALSE"
179+ DebugInformationFormat="4"/>
180+ <Tool
181+ Name="VCCustomBuildTool"/>
182+ <Tool
183+ Name="VCLibrarianTool"
184+ OutputFile="$(OutDir)/cruise.lib"/>
185+ <Tool
186+ Name="VCMIDLTool"/>
187+ <Tool
188+ Name="VCPostBuildEventTool"/>
189+ <Tool
190+ Name="VCPreBuildEventTool"/>
191+ <Tool
192+ Name="VCPreLinkEventTool"/>
193+ <Tool
194+ Name="VCResourceCompilerTool"/>
195+ <Tool
196+ Name="VCWebServiceProxyGeneratorTool"/>
197+ <Tool
198+ Name="VCXMLDataGeneratorTool"/>
199+ <Tool
200+ Name="VCManagedWrapperGeneratorTool"/>
201+ <Tool
202+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
203+ </Configuration>
204+ <Configuration
205+ Name="Release|Win32"
206+ OutputDirectory="cruise_Release"
207+ IntermediateDirectory="cruise_Release"
208+ ConfigurationType="4"
209+ CharacterSet="2"
210+ WholeProgramOptimization="FALSE">
211+ <Tool
212+ Name="VCCLCompilerTool"
213+ AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
214+ Optimization="2"
215+ InlineFunctionExpansion="1"
216+ OmitFramePointers="TRUE"
217+ AdditionalIncludeDirectories="../..;../../engines"
218+ PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
219+ StringPooling="TRUE"
220+ ExceptionHandling="TRUE"
221+ RuntimeLibrary="0"
222+ BufferSecurityCheck="FALSE"
223+ EnableFunctionLevelLinking="FALSE"
224+ DisableLanguageExtensions="FALSE"
225+ ForceConformanceInForLoopScope="TRUE"
226+ UsePrecompiledHeader="0"
227+ WarningLevel="4"
228+ DebugInformationFormat="0"/>
229+ <Tool
230+ Name="VCCustomBuildTool"/>
231+ <Tool
232+ Name="VCLibrarianTool"
233+ OutputFile="$(OutDir)/cruise.lib"/>
234+ <Tool
235+ Name="VCMIDLTool"/>
236+ <Tool
237+ Name="VCPostBuildEventTool"/>
238+ <Tool
239+ Name="VCPreBuildEventTool"/>
240+ <Tool
241+ Name="VCPreLinkEventTool"/>
242+ <Tool
243+ Name="VCResourceCompilerTool"/>
244+ <Tool
245+ Name="VCWebServiceProxyGeneratorTool"/>
246+ <Tool
247+ Name="VCXMLDataGeneratorTool"/>
248+ <Tool
249+ Name="VCManagedWrapperGeneratorTool"/>
250+ <Tool
251+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
252+ </Configuration>
253+ </Configurations>
254+ <References>
255+ </References>
256+ <Files>
257+ <File
258+ RelativePath="..\..\engines\cruise\actor.cpp">
259+ </File>
260+ <File
261+ RelativePath="..\..\engines\cruise\actor.h">
262+ </File>
263+ <File
264+ RelativePath="..\..\engines\cruise\background.cpp">
265+ </File>
266+ <File
267+ RelativePath="..\..\engines\cruise\background.h">
268+ </File>
269+ <File
270+ RelativePath="..\..\engines\cruise\backgroundIncrust.cpp">
271+ </File>
272+ <File
273+ RelativePath="..\..\engines\cruise\backgroundIncrust.h">
274+ </File>
275+ <File
276+ RelativePath="..\..\engines\cruise\cell.cpp">
277+ </File>
278+ <File
279+ RelativePath="..\..\engines\cruise\cell.h">
280+ </File>
281+ <File
282+ RelativePath="..\..\engines\cruise\cruise.cpp">
283+ </File>
284+ <File
285+ RelativePath="..\..\engines\cruise\cruise.h">
286+ </File>
287+ <File
288+ RelativePath="..\..\engines\cruise\cruise_main.cpp">
289+ </File>
290+ <File
291+ RelativePath="..\..\engines\cruise\cruise_main.h">
292+ </File>
293+ <File
294+ RelativePath="..\..\engines\cruise\ctp.cpp">
295+ </File>
296+ <File
297+ RelativePath="..\..\engines\cruise\ctp.h">
298+ </File>
299+ <File
300+ RelativePath="..\..\engines\cruise\dataLoader.cpp">
301+ </File>
302+ <File
303+ RelativePath="..\..\engines\cruise\dataLoader.h">
304+ </File>
305+ <File
306+ RelativePath="..\..\engines\cruise\decompiler.cpp">
307+ </File>
308+ <File
309+ RelativePath="..\..\engines\cruise\delphine-unpack.cpp">
310+ </File>
311+ <File
312+ RelativePath="..\..\engines\cruise\detection.cpp">
313+ </File>
314+ <File
315+ RelativePath="..\..\engines\cruise\font.cpp">
316+ </File>
317+ <File
318+ RelativePath="..\..\engines\cruise\font.h">
319+ </File>
320+ <File
321+ RelativePath="..\..\engines\cruise\fontCharacterTable.cpp">
322+ </File>
323+ <File
324+ RelativePath="..\..\engines\cruise\fontCharacterTable.h">
325+ </File>
326+ <File
327+ RelativePath="..\..\engines\cruise\function.cpp">
328+ </File>
329+ <File
330+ RelativePath="..\..\engines\cruise\function.h">
331+ </File>
332+ <File
333+ RelativePath="..\..\engines\cruise\gfxModule.cpp">
334+ </File>
335+ <File
336+ RelativePath="..\..\engines\cruise\gfxModule.h">
337+ </File>
338+ <File
339+ RelativePath="..\..\engines\cruise\linker.cpp">
340+ </File>
341+ <File
342+ RelativePath="..\..\engines\cruise\linker.h">
343+ </File>
344+ <File
345+ RelativePath="..\..\engines\cruise\mainDraw.cpp">
346+ </File>
347+ <File
348+ RelativePath="..\..\engines\cruise\mainDraw.h">
349+ </File>
350+ <File
351+ RelativePath="..\..\engines\cruise\menu.cpp">
352+ </File>
353+ <File
354+ RelativePath="..\..\engines\cruise\menu.h">
355+ </File>
356+ <File
357+ RelativePath="..\..\engines\cruise\mouse.cpp">
358+ </File>
359+ <File
360+ RelativePath="..\..\engines\cruise\mouse.h">
361+ </File>
362+ <File
363+ RelativePath="..\..\engines\cruise\object.cpp">
364+ </File>
365+ <File
366+ RelativePath="..\..\engines\cruise\object.h">
367+ </File>
368+ <File
369+ RelativePath="..\..\engines\cruise\overlay.cpp">
370+ </File>
371+ <File
372+ RelativePath="..\..\engines\cruise\overlay.h">
373+ </File>
374+ <File
375+ RelativePath="..\..\engines\cruise\perso.cpp">
376+ </File>
377+ <File
378+ RelativePath="..\..\engines\cruise\perso.h">
379+ </File>
380+ <File
381+ RelativePath="..\..\engines\cruise\polys.cpp">
382+ </File>
383+ <File
384+ RelativePath="..\..\engines\cruise\polys.h">
385+ </File>
386+ <File
387+ RelativePath="..\..\engines\cruise\saveload.cpp">
388+ </File>
389+ <File
390+ RelativePath="..\..\engines\cruise\saveload.h">
391+ </File>
392+ <File
393+ RelativePath="..\..\engines\cruise\script.cpp">
394+ </File>
395+ <File
396+ RelativePath="..\..\engines\cruise\script.h">
397+ </File>
398+ <File
399+ RelativePath="..\..\engines\cruise\stack.cpp">
400+ </File>
401+ <File
402+ RelativePath="..\..\engines\cruise\stack.h">
403+ </File>
404+ <File
405+ RelativePath="..\..\engines\cruise\stringSupport.cpp">
406+ </File>
407+ <File
408+ RelativePath="..\..\engines\cruise\stringSupport.h">
409+ </File>
410+ <File
411+ RelativePath="..\..\engines\cruise\various.cpp">
412+ </File>
413+ <File
414+ RelativePath="..\..\engines\cruise\various.h">
415+ </File>
416+ <File
417+ RelativePath="..\..\engines\cruise\vars.cpp">
418+ </File>
419+ <File
420+ RelativePath="..\..\engines\cruise\vars.h">
421+ </File>
422+ <File
423+ RelativePath="..\..\engines\cruise\volume.cpp">
424+ </File>
425+ <File
426+ RelativePath="..\..\engines\cruise\volume.h">
427+ </File>
428+ </Files>
429+ <Globals>
430+ </Globals>
431+</VisualStudioProject>
432Index: dists/msvc71/kyra.vcproj
433===================================================================
434--- dists/msvc71/kyra.vcproj (revision 26637)
435+++ dists/msvc71/kyra.vcproj (working copy)
436@@ -122,6 +122,9 @@
437 RelativePath="..\..\engines\kyra\debugger.h">
438 </File>
439 <File
440+ RelativePath="..\..\engines\kyra\detection.cpp">
441+ </File>
442+ <File
443 RelativePath="..\..\engines\kyra\gui.cpp">
444 </File>
445 <File
446@@ -146,9 +149,6 @@
447 RelativePath="..\..\engines\kyra\kyra_v3.h">
448 </File>
449 <File
450- RelativePath="..\..\engines\kyra\plugin.cpp">
451- </File>
452- <File
453 RelativePath="..\..\engines\kyra\resource.cpp">
454 </File>
455 <File
456Index: dists/msvc71/lure.vcproj
457===================================================================
458--- dists/msvc71/lure.vcproj (revision 26637)
459+++ dists/msvc71/lure.vcproj (working copy)
460@@ -140,6 +140,9 @@
461 RelativePath="..\..\engines\lure\decode.h">
462 </File>
463 <File
464+ RelativePath="..\..\engines\lure\detection.cpp">
465+ </File>
466+ <File
467 RelativePath="..\..\engines\lure\disk.cpp">
468 </File>
469 <File
470Index: dists/msvc71/gob.vcproj
471===================================================================
472--- dists/msvc71/gob.vcproj (revision 26637)
473+++ dists/msvc71/gob.vcproj (working copy)
474@@ -203,6 +203,9 @@
475 RelativePath="..\..\engines\gob\init_v2.cpp">
476 </File>
477 <File
478+ RelativePath="..\..\engines\gob\init_v3.cpp">
479+ </File>
480+ <File
481 RelativePath="..\..\engines\gob\inter.cpp">
482 </File>
483 <File
484Index: dists/msvc71/parallaction.vcproj
485===================================================================
486--- dists/msvc71/parallaction.vcproj (revision 26637)
487+++ dists/msvc71/parallaction.vcproj (working copy)
488@@ -144,6 +144,9 @@
489 RelativePath="..\..\engines\parallaction\disk.h">
490 </File>
491 <File
492+ RelativePath="..\..\engines\parallaction\font.cpp">
493+ </File>
494+ <File
495 RelativePath="..\..\engines\parallaction\graphics.cpp">
496 </File>
497 <File
498@@ -195,6 +198,9 @@
499 RelativePath="..\..\engines\parallaction\walk.cpp">
500 </File>
501 <File
502+ RelativePath="..\..\engines\parallaction\walk.h">
503+ </File>
504+ <File
505 RelativePath="..\..\engines\parallaction\zone.cpp">
506 </File>
507 <File
508Index: dists/msvc71/saga.vcproj
509===================================================================
510--- dists/msvc71/saga.vcproj (revision 26637)
511+++ dists/msvc71/saga.vcproj (working copy)
512@@ -128,6 +128,15 @@
513 RelativePath="..\..\engines\saga\console.h">
514 </File>
515 <File
516+ RelativePath="..\..\engines\saga\detection.cpp">
517+ </File>
518+ <File
519+ RelativePath="..\..\engines\saga\detection_tables.h">
520+ </File>
521+ <File
522+ RelativePath="..\..\engines\saga\displayinfo.h">
523+ </File>
524+ <File
525 RelativePath="..\..\engines\saga\events.cpp">
526 </File>
527 <File
528@@ -143,9 +152,6 @@
529 RelativePath="..\..\engines\saga\font_map.cpp">
530 </File>
531 <File
532- RelativePath="..\..\engines\saga\game.cpp">
533- </File>
534- <File
535 RelativePath="..\..\engines\saga\gfx.cpp">
536 </File>
537 <File
538@@ -227,9 +233,6 @@
539 RelativePath="..\..\engines\saga\saga.h">
540 </File>
541 <File
542- RelativePath="..\..\engines\saga\sagagame.h">
543- </File>
544- <File
545 RelativePath="..\..\engines\saga\sagaresnames.h">
546 </File>
547 <File