Skip to content

Commit 52ed80e

Browse files
authored
Merge pull request #16 from mrikola/win32-fixes
A few changes to keep the executable compiling on MinGW
2 parents c3f1070 + 3bf89f0 commit 52ed80e

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

Diff for: externals/findsdl2-cmake/FindSDL2_mixer.cmake

+2
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444

4545
find_path(SDL2_MIXER_INCLUDE_DIR SDL_mixer.h
4646
HINTS
47+
$ENV{SDL2_MIXER_DIR}
4748
ENV SDL2MIXERDIR
4849
ENV SDL2DIR
4950
PATH_SUFFIXES SDL2
@@ -61,6 +62,7 @@ endif()
6162
find_library(SDL2_MIXER_LIBRARY
6263
NAMES SDL2_mixer
6364
HINTS
65+
$ENV{SDL2_MIXER_DIR}
6466
ENV SDL2MIXERDIR
6567
ENV SDL2DIR
6668
PATH_SUFFIXES lib ${VC_LIB_PATH_SUFFIX}

Diff for: src/Libraries/RES/Source/resfile.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
4040

4141
#include <string.h>
4242
#include <stdlib.h>
43+
#include <sys/stat.h>
4344

4445
#include "res.h"
4546
#include "res_.h"
@@ -122,7 +123,6 @@ size_t DG_strlcat(char* dst, const char* src, size_t dstsize)
122123
#ifndef _WIN32
123124

124125
#include <dirent.h>
125-
#include <sys/stat.h>
126126
#include <unistd.h>
127127

128128
static int check_and_append_pathelem(char dirbuf[PATH_MAX], const char* elem)

Diff for: src/stubs/Carbon/carbon_stubs.c

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#include "Carbon.h"
22

33
#include <SDL.h>
4+
#include <stdlib.h>
45

56
#include "lg.h"
67

0 commit comments

Comments
 (0)