From 01156f514a6bbc1f650ea905592ddcb196300461 Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Sat, 11 Feb 2017 21:43:47 +0100 Subject: [PATCH] Fix build on linux --- src/arrange.cpp | 4 ++-- src/chemin.cpp | 6 +++--- src/decblupi.cpp | 10 +++++----- src/decgoal.cpp | 4 ++-- src/decio.cpp | 6 +++--- src/decmap.cpp | 4 ++-- src/decmove.cpp | 6 +++--- src/decor.cpp | 2 +- src/decor.h | 6 +++--- src/decstat.cpp | 8 ++++---- src/event.cpp | 8 +++++++- src/fog.cpp | 2 +- src/misc.cpp | 9 ++++++++- src/obstacle.cpp | 6 +++--- src/pixmap.cpp | 11 +++++++++-- 15 files changed, 56 insertions(+), 36 deletions(-) diff --git a/src/arrange.cpp b/src/arrange.cpp index 971dde2..0e25bfc 100644 --- a/src/arrange.cpp +++ b/src/arrange.cpp @@ -1,8 +1,8 @@ // Arrange.cpp // -#include "DECOR.H" -#include "MISC.H" +#include "decor.h" +#include "misc.h" // Cette table indique les quarts de cases contenant de // l'eau lorsque la valeur est à un. diff --git a/src/chemin.cpp b/src/chemin.cpp index f940a9c..ab0fe27 100644 --- a/src/chemin.cpp +++ b/src/chemin.cpp @@ -2,9 +2,9 @@ // (c) 1997, Denis Dumoulin -#include "DECOR.H" -#include "FIFO.H" -#include "ACTION.H" +#include "decor.h" +#include "fifo.h" +#include "action.h" // Mémorise toutes les positions des blupi. diff --git a/src/decblupi.cpp b/src/decblupi.cpp index 9ebe0c2..4def250 100644 --- a/src/decblupi.cpp +++ b/src/decblupi.cpp @@ -3,11 +3,11 @@ #include #include "gettext.h" -#include "DEF.H" -#include "DECOR.H" -#include "ACTION.H" -#include "MISC.H" -#include "RESOURCE.H" +#include "def.h" +#include "decor.h" +#include "action.h" +#include "misc.h" +#include "resource.h" #include "decgoal.h" // Cette table donne l'action à effectuer pour un bouton diff --git a/src/decgoal.cpp b/src/decgoal.cpp index 6553ccb..1687f97 100644 --- a/src/decgoal.cpp +++ b/src/decgoal.cpp @@ -1,8 +1,8 @@ // DecGoal.cpp #include "decgoal.h" -#include "DEF.H" -#include "DECOR.H" +#include "def.h" +#include "decor.h" short table_goal_nbop[] = { diff --git a/src/decio.cpp b/src/decio.cpp index da5fd8c..1831adc 100644 --- a/src/decio.cpp +++ b/src/decio.cpp @@ -1,9 +1,9 @@ // DecIO.cpp // -#include "DEF.H" -#include "DECOR.H" -#include "MISC.H" +#include "def.h" +#include "decor.h" +#include "misc.h" typedef struct { diff --git a/src/decmap.cpp b/src/decmap.cpp index 90af714..73cfc82 100644 --- a/src/decmap.cpp +++ b/src/decmap.cpp @@ -2,8 +2,8 @@ // #include "blupi.h" -#include "DEF.H" -#include "DECOR.H" +#include "def.h" +#include "decor.h" #define MAP_CADRE 1 #define MAP_FOG 2 diff --git a/src/decmove.cpp b/src/decmove.cpp index 60df90d..577cc22 100644 --- a/src/decmove.cpp +++ b/src/decmove.cpp @@ -1,9 +1,9 @@ // DecMove.cpp // -#include "DECOR.H" -#include "MISC.H" -#include "DECMOVE.h" +#include "decor.h" +#include "misc.h" +#include "decmove.h" // Mouvement pour secouer un arbre // (synchrone avec ACTION_PIOCHE). diff --git a/src/decor.cpp b/src/decor.cpp index 0a4cc1e..bacaf29 100644 --- a/src/decor.cpp +++ b/src/decor.cpp @@ -14,7 +14,7 @@ #include "text.h" #include "misc.h" #include "fifo.h" -#include "DECMOVE.h" +#include "decmove.h" ///////////////////////////////////////////////////////////////////////////// diff --git a/src/decor.h b/src/decor.h index 03ed178..279fd77 100644 --- a/src/decor.h +++ b/src/decor.h @@ -3,9 +3,9 @@ #pragma once #include -#include "DEF.H" -#include "SOUND.H" -#include "PIXMAP.H" +#include "def.h" +#include "sound.h" +#include "pixmap.h" ///////////////////////////////////////////////////////////////////////////// diff --git a/src/decstat.cpp b/src/decstat.cpp index fb46287..a98597a 100644 --- a/src/decstat.cpp +++ b/src/decstat.cpp @@ -2,10 +2,10 @@ // #include "gettext.h" -#include "RESOURCE.H" -#include "DECOR.H" -#include "TEXT.H" -#include "MISC.H" +#include "resource.h" +#include "decor.h" +#include "text.h" +#include "misc.h" #define STATNB 12 diff --git a/src/event.cpp b/src/event.cpp index a26b1d3..0433592 100644 --- a/src/event.cpp +++ b/src/event.cpp @@ -20,6 +20,12 @@ #include "text.h" #include "misc.h" +#ifdef _WIN32 +#define unlink _unlink +#else // _WIN32 +#include +#endif // !_WINE32 + #define DEF_TIME_HELP 10000 // ~10 minutes #define DEF_TIME_DEMO 1000 // ~1 minute @@ -4349,7 +4355,7 @@ void CEvent::DemoRecStop() if ( m_pDemoBuffer != nullptr ) { - _unlink ("data/demo.blp"); + unlink ("data/demo.blp"); file = fopen("data/demo.blp", "wb"); if ( file != nullptr ) { diff --git a/src/fog.cpp b/src/fog.cpp index 1142d4c..cc3c4f4 100644 --- a/src/fog.cpp +++ b/src/fog.cpp @@ -1,6 +1,6 @@ // Fog.cpp -#include "DECOR.H" +#include "decor.h" // Cette table indique les quarts de cases contenant du // brouillard lorsque la valeur est à un. diff --git a/src/misc.cpp b/src/misc.cpp index 077630a..88729b0 100644 --- a/src/misc.cpp +++ b/src/misc.cpp @@ -7,7 +7,14 @@ #include #include #include + +#ifdef _WIN32 #include +#define mkdir(a, b) _mkdir(a) +#else /* _WIN32 */ +#include +#endif /*! _WIN32 */ + #include "misc.h" #include "blupi.h" #include "def.h" @@ -102,7 +109,7 @@ void AddUserPath(char *pFilename) strcat(temp, pFilename); last = temp[pos]; temp[pos] = 0; - _mkdir (temp); + mkdir (temp, 755); temp[pos] = last; } else diff --git a/src/obstacle.cpp b/src/obstacle.cpp index 151a337..07cbf81 100644 --- a/src/obstacle.cpp +++ b/src/obstacle.cpp @@ -1,9 +1,9 @@ // Obstacle.cpp // -#include "DECOR.H" -#include "MISC.H" -#include "ACTION.H" +#include "decor.h" +#include "misc.h" +#include "action.h" // Cette table indique les obstacles sur les sols. // 0=passage, 1=obstacle diff --git a/src/pixmap.cpp b/src/pixmap.cpp index b07199d..79e2834 100644 --- a/src/pixmap.cpp +++ b/src/pixmap.cpp @@ -3,8 +3,15 @@ #include #include -#include #include + +#ifdef _WIN32 +#include +#define access _access +#else /* _WIN32 */ +#include +#endif /* !_WIN32 */ + #include "def.h" #include "pixmap.h" #include "misc.h" @@ -192,7 +199,7 @@ bool CPixmap::Cache(int channel, const char *pFilename, POINT totalDim, POINT ic if ( channel < 0 || channel >= MAXIMAGE ) return false; std::string file = pFilename; - if (_access ((file + ".bmp").c_str (), 0 /* F_OK */) != -1) + if (access ((file + ".bmp").c_str (), 0 /* F_OK */) != -1) file += ".bmp"; SDL_Surface *surface = SDL_LoadBMP (file.c_str ());