eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 39efadcb6b into ead439335e

This commit is contained in:
k3tamina 2022-06-23 11:59:06 +07:00 committed by GitHub
parent ead439335e 39efadcb6b
commit 5056070dcf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -277,3 +277,4 @@ target_include_directories(${EXECUTABLE_NAME} PRIVATE ${ZLIB_INCLUDE_DIRS})
target_link_libraries(${EXECUTABLE_NAME} ${SDL2_LIBRARIES}) target_link_libraries(${EXECUTABLE_NAME} ${SDL2_LIBRARIES})
target_include_directories(${EXECUTABLE_NAME} PRIVATE ${SDL2_INCLUDE_DIRS}) target_include_directories(${EXECUTABLE_NAME} PRIVATE ${SDL2_INCLUDE_DIRS})
add_definitions(-DSDL_MAIN_HANDLED)

1
src/dsound_compat.h
View File

@ -9,6 +9,7 @@
#include <windows.h> #include <windows.h>
#include <mmreg.h> #include <mmreg.h>
#include <mmsystem.h>
#define DIRECTSOUND_VERSION 0x0300 #define DIRECTSOUND_VERSION 0x0300
#include <dsound.h> #include <dsound.h>

2
src/file_find.cc
View File

@ -83,7 +83,7 @@ bool fileFindNext(DirectoryFileFindData* findData)
// 0x4E63CC // 0x4E63CC
bool findFindClose(DirectoryFileFindData* findData) bool findFindClose(DirectoryFileFindData* findData)
{ {
#if defined(_MSC_VER) #if defined(_WIN32)
FindClose(findData->hFind); FindClose(findData->hFind);
#else #else
if (findData->dir != NULL) { if (findData->dir != NULL) {