diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | library/Hooks-darwin.cpp | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ca8592b0..f77a6c3b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -139,9 +139,6 @@ include_directories(depends/tinyxml) include_directories(depends/tthread) include_directories(${ZLIB_INCLUDE_DIRS}) include_directories(depends/clsocket/src) -if(APPLE) - include_directories(${CMAKE_INSTALL_PREFIX}/libs/SDL.framework/Headers) -endif() add_subdirectory(depends) diff --git a/library/Hooks-darwin.cpp b/library/Hooks-darwin.cpp index 347881ee..ef89105d 100644 --- a/library/Hooks-darwin.cpp +++ b/library/Hooks-darwin.cpp @@ -83,8 +83,8 @@ DFhackCExport void SDL_Quit(void) } // called by DF to check input events -static int (*_SDL_PollEvent)(SDL_Event* event) = 0; -DFhackCExport int SDL_PollEvent(SDL_Event* event) +static int (*_SDL_PollEvent)(SDL::Event* event) = 0; +DFhackCExport int SDL_PollEvent(SDL::Event* event) { pollevent_again: // if SDL returns 0 here, it means there are no more events. return 0 @@ -140,7 +140,7 @@ DFhackCExport int SDL_Init(uint32_t flags) fprintf(stderr,"dfhack: saving real SDL functions\n"); _SDL_Init = (int (*)( uint32_t )) dlsym(RTLD_NEXT, "SDL_Init"); _SDL_Quit = (void (*)( void )) dlsym(RTLD_NEXT, "SDL_Quit"); - _SDL_PollEvent = (int (*)(SDL_Event*))dlsym(RTLD_NEXT,"SDL_PollEvent"); + _SDL_PollEvent = (int (*)(SDL::Event*))dlsym(RTLD_NEXT,"SDL_PollEvent"); fprintf(stderr,"dfhack: saved real SDL functions\n"); // check if we got them |
