From 09c1330a0ed2ff7728bf255f92a45be958f6b542 Mon Sep 17 00:00:00 2001 From: David Carlier Date: Fri, 9 Dec 2016 16:21:54 +0000 Subject: [PATCH] make it compilable under openbsd --- neo/CMakeLists.txt | 3 +++ neo/framework/minizip/ioapi.c | 2 +- neo/sys/sys_public.h | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/neo/CMakeLists.txt b/neo/CMakeLists.txt index 9d3ea50d..809251ad 100644 --- a/neo/CMakeLists.txt +++ b/neo/CMakeLists.txt @@ -108,6 +108,9 @@ include_directories(${VORBISFILE_INCLUDE_DIR}) find_package(OpenAL REQUIRED) include_directories(${OPENAL_INCLUDE_DIR}) +find_package(X11 REQUIRED) +include_directories(${X11_INCLUDE_DIR}) + if (SDL2) # skip SDL2main if(APPLE OR WIN32) diff --git a/neo/framework/minizip/ioapi.c b/neo/framework/minizip/ioapi.c index 5dc99d59..f59b904a 100644 --- a/neo/framework/minizip/ioapi.c +++ b/neo/framework/minizip/ioapi.c @@ -17,7 +17,7 @@ #define _CRT_SECURE_NO_WARNINGS #endif -#if defined(__APPLE__) || defined(IOAPI_NO_64) +#if defined(__APPLE__) || defined(IOAPI_NO_64) || defined(__OpenBSD__) // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions #define FOPEN_FUNC(filename, mode) fopen(filename, mode) #define FTELLO_FUNC(stream) ftello(stream) diff --git a/neo/sys/sys_public.h b/neo/sys/sys_public.h index 150b16f1..fbac1a88 100644 --- a/neo/sys/sys_public.h +++ b/neo/sys/sys_public.h @@ -41,7 +41,7 @@ typedef enum { CPUID_SSE2 = 0x00080, // Streaming SIMD Extensions 2 CPUID_SSE3 = 0x00100, // Streaming SIMD Extentions 3 aka Prescott's New Instructions CPUID_ALTIVEC = 0x00200, // AltiVec -} cpuid_t; +} cpuidSimd_t; typedef enum { AXIS_SIDE,