File tree 6 files changed +15
-5
lines changed
6 files changed +15
-5
lines changed Original file line number Diff line number Diff line change @@ -309,7 +309,7 @@ else()
309
309
# If we're compiling with a custom GCC on the Mac (which we know since g++-4.2 doesn't support C++11) statically link libgcc.
310
310
set ( ALL_C_FLAGS "-static-libgcc" )
311
311
endif ()
312
- elseif ( NOT MINGW )
312
+ elseif ( NOT MINGW AND NOT HAIKU )
313
313
# Generic GCC/Clang requires position independent executable to be enabled explicitly
314
314
set ( ALL_C_FLAGS "${ALL_C_FLAGS} -fPIE" )
315
315
set ( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie" )
Original file line number Diff line number Diff line change @@ -188,7 +188,11 @@ if(WIN32)
188
188
add_definitions (-DUNICODE -D_UNICODE)
189
189
else ()
190
190
set (ZVULKAN_SOURCES ${ZVULKAN_SOURCES} ${ZVULKAN_UNIX_SOURCES} )
191
- set (ZVULKAN_LIBS ${CMAKE_DL_LIBS} -ldl)
191
+ if (NOT HAIKU)
192
+ set (ZVULKAN_LIBS ${CMAKE_DL_LIBS} -ldl)
193
+ else ()
194
+ set (ZVULKAN_LIBS ${CMAKE_DL_LIBS} )
195
+ endif ()
192
196
add_definitions (-DUNIX -D_UNIX)
193
197
add_link_options (-pthread)
194
198
endif ()
Original file line number Diff line number Diff line change @@ -130,7 +130,11 @@ elseif(APPLE)
130
130
add_link_options (-pthread)
131
131
else ()
132
132
set (ZWIDGET_SOURCES ${ZWIDGET_SOURCES} ${ZWIDGET_SDL2_SOURCES} )
133
- set (ZWIDGET_LIBS ${CMAKE_DL_LIBS} -ldl)
133
+ if (NOT HAIKU)
134
+ set (ZWIDGET_LIBS ${CMAKE_DL_LIBS} -ldl)
135
+ else ()
136
+ set (ZWIDGET_LIBS ${CMAKE_DL_LIBS} )
137
+ endif ()
134
138
add_definitions (-DUNIX -D_UNIX)
135
139
add_link_options (-pthread)
136
140
endif ()
Original file line number Diff line number Diff line change 2
2
3
3
#include "zstring.h"
4
4
5
- #ifdef __unix__
5
+ #if defined( __unix__ ) || defined( __HAIKU__ )
6
6
FString GetUserFile (const char * path );
7
7
#endif
8
8
FString M_GetAppDataPath (bool create );
Original file line number Diff line number Diff line change @@ -134,7 +134,7 @@ static PROC WinGetProcAddress(const char *name)
134
134
#if defined(__APPLE__ )
135
135
#define IntGetProcAddress (name ) AppleGLGetProcAddress(name)
136
136
#else
137
- #if defined(__sgi ) || defined(__sun ) || defined(__unix__ )
137
+ #if defined(__sgi ) || defined(__sun ) || defined(__unix__ ) || defined( __HAIKU__ )
138
138
void * SDL_GL_GetProcAddress (const char * proc );
139
139
#define IntGetProcAddress (name ) SDL_GL_GetProcAddress((const char*)name)
140
140
//#define IntGetProcAddress(name) PosixGetProcAddress((const GLubyte*)name)
Original file line number Diff line number Diff line change @@ -105,6 +105,8 @@ const char *GetVersionString();
105
105
106
106
#if defined(__APPLE__ ) || defined(_WIN32 )
107
107
#define GAME_DIR GAMENAME
108
+ #elif defined(__HAIKU__ )
109
+ #define GAME_DIR "config/settings/" GAMENAME
108
110
#else
109
111
#define GAME_DIR ".config/" GAMENAMELOWERCASE
110
112
#endif
You can’t perform that action at this time.
0 commit comments