Browse Source

Fix web build on Windows host system.
Close #2224.

Yao Wei Tjong 姚伟忠 8 years ago
parent
commit
ad9c6594d1
2 changed files with 4 additions and 55 deletions
  1. 0 55
      Source/ThirdParty/SDL/include/SDL_config.h
  2. 4 0
      Source/Urho3D/IO/FileSystem.cpp

+ 0 - 55
Source/ThirdParty/SDL/include/SDL_config.h

@@ -1,55 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2017 Sam Lantinga <[email protected]>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-// Modified by Lasse Oorni for Urho3D
-
-#ifndef SDL_config_h_
-#define SDL_config_h_
-
-#include "SDL_platform.h"
-
-/**
- *  \file SDL_config.h
- */
-
-/* Add any platform that doesn't build using the configure system. */
-#if defined(__WIN32__)
-#include "SDL_config_windows.h"
-#elif defined(__WINRT__)
-#include "SDL_config_winrt.h"
-#elif defined(__MACOSX__)
-#include "SDL_config_macosx.h"
-#elif defined(__IPHONEOS__)
-#include "SDL_config_iphoneos.h"
-#elif defined(__ANDROID__)
-#include "SDL_config_android.h"
-#elif defined(__PSP__)
-#include "SDL_config_psp.h"
-#else
-// Urho3D: add Linux prebuilt config file
-#include "SDL_config_linux.h"
-#endif /* platform config */
-
-#ifdef USING_GENERATED_CONFIG_H
-#error Wrong SDL_config.h, check your include path?
-#endif
-
-#endif /* SDL_config_h_ */

+ 4 - 0
Source/Urho3D/IO/FileSystem.cpp

@@ -1070,10 +1070,14 @@ bool IsAbsolutePath(const String& pathName)
 String FileSystem::GetTemporaryDir() const
 {
 #if defined(_WIN32)
+#if defined(MINI_URHO)
+    return getenv("TMP");
+#else
     wchar_t pathName[MAX_PATH];
     pathName[0] = 0;
     GetTempPathW(SDL_arraysize(pathName), pathName);
     return AddTrailingSlash(String(pathName));
+#endif
 #else
     if (char* pathName = getenv("TMPDIR"))
         return AddTrailingSlash(pathName);