diff options
author | Simon Howard | 2009-06-09 18:28:51 +0000 |
---|---|---|
committer | Simon Howard | 2009-06-09 18:28:51 +0000 |
commit | 122dcc372f579c54ba2e6f793493cfa4d0a7d609 (patch) | |
tree | 5df714640d4ae007e95540c89b8f6f0d80f79767 /src/d_iwad.c | |
parent | 46ad00deca23f3c57fcaed47af67f9003d6a4048 (diff) | |
parent | b6491fa4aefc073a760d4bad51f55c2d6c0f5f35 (diff) | |
download | chocolate-doom-122dcc372f579c54ba2e6f793493cfa4d0a7d609.tar.gz chocolate-doom-122dcc372f579c54ba2e6f793493cfa4d0a7d609.tar.bz2 chocolate-doom-122dcc372f579c54ba2e6f793493cfa4d0a7d609.zip |
Merge from trunk.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1579
Diffstat (limited to 'src/d_iwad.c')
-rw-r--r-- | src/d_iwad.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/d_iwad.c b/src/d_iwad.c index 31f97d5b..59760adb 100644 --- a/src/d_iwad.c +++ b/src/d_iwad.c @@ -76,7 +76,7 @@ static void AddIWADDir(char *dir) // keys installed by the Windows installers for various CD versions // of Doom. From these keys we can deduce where to find an IWAD. -#ifdef _WIN32 +#if defined(_WIN32) && !defined(_WIN32_WCE) #define WIN32_LEAN_AND_MEAN #include <windows.h> @@ -490,7 +490,14 @@ static void BuildIWADDirList(void) AddDoomWadPath(); -#ifdef _WIN32 +#if defined(_WIN32_WCE) + + // Windows CE locations: + + AddIWADDir("\\Storage Card"); + AddIWADDir(getenv("HOME")); + +#elif defined(_WIN32) // Search the registry and find where IWADs have been installed. |