diff options
| -rw-r--r-- | TODO | 6 | ||||
| -rw-r--r-- | dists/msevc4/scumm/scumm.vcp | 2 | ||||
| -rw-r--r-- | dists/msvc6/scumm.dsp | 2 | ||||
| -rw-r--r-- | dists/msvc7/scumm.vcproj | 2 | ||||
| -rw-r--r-- | scumm/module.mk | 2 | ||||
| -rw-r--r-- | scumm/scumm.cpp (renamed from scumm/scummvm.cpp) | 0 |
6 files changed, 4 insertions, 10 deletions
@@ -190,12 +190,6 @@ SCUMM details * Add support for sound effects format found in Sega CD version of Monkey Island -* Rename scummvm.cpp to scumm.cpp for consistency. [Fingolfin is working on - this, please don't do anything about this before talking to him]. - 1) Try to get scummvm.cpp fixed for ViewCVS [in progress!] - 2a) If 1) succeeded, file SF.net CVS file rename request - 2b) If 2) failed, do brute force file rename (cp && cvs add && cvs rm) - 3) Adjust Makefile and project files to use the new name * Possible implement a new resource manager, which then also could be shared by ScummEX. [Jamieson has some ideas about this and might work on it| * Support all Mac games without needing rescumm. These games being: dott, diff --git a/dists/msevc4/scumm/scumm.vcp b/dists/msevc4/scumm/scumm.vcp index f2a512c81b..ea4d5919d6 100644 --- a/dists/msevc4/scumm/scumm.vcp +++ b/dists/msevc4/scumm/scumm.vcp @@ -16570,7 +16570,7 @@ SOURCE=..\..\..\scumm\scumm.h # End Source File # Begin Source File -SOURCE=..\..\..\scumm\scummvm.cpp +SOURCE=..\..\..\scumm\scumm.cpp !IF "$(CFG)" == "scumm - Win32 (WCE emulator) Release" diff --git a/dists/msvc6/scumm.dsp b/dists/msvc6/scumm.dsp index cac7845df7..4caaa18969 100644 --- a/dists/msvc6/scumm.dsp +++ b/dists/msvc6/scumm.dsp @@ -531,7 +531,7 @@ SOURCE=..\..\scumm\scumm.h # End Source File # Begin Source File -SOURCE=..\..\scumm\scummvm.cpp +SOURCE=..\..\scumm\scumm.cpp # End Source File # Begin Source File diff --git a/dists/msvc7/scumm.vcproj b/dists/msvc7/scumm.vcproj index 5694dc56b9..81d2483d0e 100644 --- a/dists/msvc7/scumm.vcproj +++ b/dists/msvc7/scumm.vcproj @@ -418,7 +418,7 @@ RelativePath="..\..\scumm\scumm.h"> </File> <File - RelativePath="..\..\scumm\scummvm.cpp"> + RelativePath="..\..\scumm\scumm.cpp"> </File> <File RelativePath="..\..\scumm\sound.cpp"> diff --git a/scumm/module.mk b/scumm/module.mk index c1e61263e4..220adc6327 100644 --- a/scumm/module.mk +++ b/scumm/module.mk @@ -39,7 +39,7 @@ MODULE_OBJS := \ scumm/script_v6he.o \ scumm/script_v7he.o \ scumm/script_v8.o \ - scumm/scummvm.o \ + scumm/scumm.o \ scumm/sound.o \ scumm/string.o \ scumm/usage_bits.o \ diff --git a/scumm/scummvm.cpp b/scumm/scumm.cpp index 94ed7740d0..94ed7740d0 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scumm.cpp |