thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TOOLS: Allow compilation with MinGW for all our tools again.

Browse source
This commit is contained in:
Johannes Schickel 2011-04-08 16:51:15 +02:00
parent bd253a62ac
commit 9e6a640d8d
2 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
tools/create_project/create_project.cpp
View file

@ -23,6 +23,12 @@
* *
*/ */
// HACK to allow building with the SDL backend on MinGW
// see bug #1800764 "TOOLS: MinGW tools building broken"
#ifdef main
#undef main
#endif // main
#include "create_project.h" #include "create_project.h"
#include "codeblocks.h" #include "codeblocks.h"
@ -41,7 +47,11 @@
#include <cstdlib> #include <cstdlib>
#include <ctime> #include <ctime>
#if defined(_WIN32) || defined(WIN32) #if (defined(_WIN32) || defined(WIN32)) && !defined(__GNUC__)
#define USE_WIN32_API
#endif
#ifdef USE_WIN32_API
#include <windows.h> #include <windows.h>
#else #else
#include <sstream> #include <sstream>
@ -103,7 +113,7 @@ enum ProjectType {
}; };
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
#if !(defined(_WIN32) || defined(WIN32)) #ifndef USE_WIN32_API
// Initialize random number generator for UUID creation // Initialize random number generator for UUID creation
std::srand(std::time(0)); std::srand(std::time(0));
#endif #endif
@ -860,7 +870,7 @@ bool compareNodes(const FileNode *l, const FileNode *r) {
*/ */
FileList listDirectory(const std::string &dir) { FileList listDirectory(const std::string &dir) {
FileList result; FileList result;
#if defined(_WIN32) || defined(WIN32) #ifdef USE_WIN32_API
WIN32_FIND_DATA fileInformation; WIN32_FIND_DATA fileInformation;
HANDLE fileHandle = FindFirstFile((dir + "/*").c_str(), &fileInformation); HANDLE fileHandle = FindFirstFile((dir + "/*").c_str(), &fileInformation);
@ -1035,7 +1045,7 @@ ProjectProvider::UUIDMap ProjectProvider::createUUIDMap(const BuildSetup &setup)
} }
std::string ProjectProvider::createUUID() const { std::string ProjectProvider::createUUID() const {
#if defined(_WIN32) || defined(WIN32) #ifdef USE_WIN32_API
UUID uuid; UUID uuid;
if (UuidCreate(&uuid) != RPC_S_OK) if (UuidCreate(&uuid) != RPC_S_OK)
error("UuidCreate failed"); error("UuidCreate failed");

6
tools/create_teenagent/create_teenagent.cpp
View file

@ -26,6 +26,12 @@
// Disable symbol overrides so that we can use system headers. // Disable symbol overrides so that we can use system headers.
#define FORBIDDEN_SYMBOL_ALLOW_ALL #define FORBIDDEN_SYMBOL_ALLOW_ALL
// HACK to allow building with the SDL backend on MinGW
// see bug #1800764 "TOOLS: MinGW tools building broken"
#ifdef main
#undef main
#endif // main
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>