From e9158ccb21b46ca51652fdf68baab611e052b2f4 Mon Sep 17 00:00:00 2001 From: pouillot Date: Sun, 24 Mar 2013 12:42:47 +0000 Subject: [PATCH] Re #787 Fixed MinGW et MSVC 2005 compile errors after r5353 git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5356 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: 4558a118628c09354849179eed99cc9f8c2ffb51 Former-commit-id: 7fe4a0db1500bf98313cb6966cf4f0f3222a7cbf --- src/libs/tgf/directory.cpp | 2 +- .../simuv2.1/SOLID-2.0/include/SOLID/types.h | 24 +++++++++++++++++++ src/modules/simu/simuv2.1/collide.cpp | 2 ++ src/modules/simu/simuv2/collide.cpp | 2 ++ src/modules/simu/simuv3/collide.cpp | 2 ++ 5 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 src/modules/simu/simuv2.1/SOLID-2.0/include/SOLID/types.h diff --git a/src/libs/tgf/directory.cpp b/src/libs/tgf/directory.cpp index 07c16606b..3c72ed0a2 100644 --- a/src/libs/tgf/directory.cpp +++ b/src/libs/tgf/directory.cpp @@ -115,9 +115,9 @@ bool GfDirExists(const char* pszName) if (pszName[strlen(pszName)-1] == '/' || pszName[strlen(pszName)-1] == '\\') { // Windows stat() does not supports traling (anti-)slashes ... no comment please. + // TODO: Take of the possible _multiple_ trailing (anti-)slashes ... char* pszNameNoTrailSlash = strdup(pszName); pszNameNoTrailSlash[strlen(pszName)-1] = 0; - GfLogDebug("XXXXXXXXXXX pszNameNoTrailSlash=%s\n", pszNameNoTrailSlash); const bool bAnswer = (stat(pszNameNoTrailSlash, &st) ? false : true); free(pszNameNoTrailSlash); return bAnswer; diff --git a/src/modules/simu/simuv2.1/SOLID-2.0/include/SOLID/types.h b/src/modules/simu/simuv2.1/SOLID-2.0/include/SOLID/types.h new file mode 100644 index 000000000..12c210ca1 --- /dev/null +++ b/src/modules/simu/simuv2.1/SOLID-2.0/include/SOLID/types.h @@ -0,0 +1,24 @@ +/* + * SOLID - Software Library for Interference Detection + * Copyright (c) 2001 Dtecta + * + * All rights reserved. + */ + +#ifndef SOLID_TYPES_H +#define SOLID_TYPES_H + +typedef unsigned int DT_Index; +typedef unsigned int DT_Count; +typedef unsigned int DT_Size; +typedef float DT_Scalar; +typedef int DT_Bool; + +#define DT_FALSE 0 +#define DT_TRUE 1 + + +typedef DT_Scalar DT_Vector3[3]; +typedef DT_Scalar DT_Quaternion[4]; + +#endif diff --git a/src/modules/simu/simuv2.1/collide.cpp b/src/modules/simu/simuv2.1/collide.cpp index 1ae4ee0ee..b6c6a9631 100644 --- a/src/modules/simu/simuv2.1/collide.cpp +++ b/src/modules/simu/simuv2.1/collide.cpp @@ -17,6 +17,8 @@ * * ***************************************************************************/ +#include + #include "sim.h" #define CAR_DAMMAGE 0.1 diff --git a/src/modules/simu/simuv2/collide.cpp b/src/modules/simu/simuv2/collide.cpp index c33c68a75..099eabfcb 100644 --- a/src/modules/simu/simuv2/collide.cpp +++ b/src/modules/simu/simuv2/collide.cpp @@ -17,6 +17,8 @@ * * ***************************************************************************/ +#include + #include "sim.h" #define CAR_DAMMAGE 0.1 diff --git a/src/modules/simu/simuv3/collide.cpp b/src/modules/simu/simuv3/collide.cpp index dce94a21f..5c0246bbc 100644 --- a/src/modules/simu/simuv3/collide.cpp +++ b/src/modules/simu/simuv3/collide.cpp @@ -17,6 +17,8 @@ * * ***************************************************************************/ +#include + #include "sim.h" #include "timeanalysis.h"