ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CInema: Fix Windows/MSYS2 build

This commit is contained in:
gifvex 2021-08-21 09:18:05 -04:00 committed by Vicki Pfau
parent 80a502bcc9
commit 143a336b04
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -212,8 +212,7 @@ if(WIN32)
add_definitions(-DNOMINMAX -DWIN32_LEAN_AND_MEAN) add_definitions(-DNOMINMAX -DWIN32_LEAN_AND_MEAN)
add_definitions(-D_UNICODE -DUNICODE) add_definitions(-D_UNICODE -DUNICODE)
else() else()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -municode") add_definitions(-D_GNU_SOURCE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -municode")
endif() endif()
list(APPEND OS_LIB ws2_32 shlwapi) list(APPEND OS_LIB ws2_32 shlwapi)
list(APPEND CORE_VFS_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/util/vfs/vfs-fd.c ${CMAKE_CURRENT_SOURCE_DIR}/src/platform/windows/vfs-w32.c) list(APPEND CORE_VFS_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/util/vfs/vfs-fd.c ${CMAKE_CURRENT_SOURCE_DIR}/src/platform/windows/vfs-w32.c)

3
src/platform/qt/CMakeLists.txt
View File

@ -310,6 +310,9 @@ set_target_properties(${BINARY_NAME}-qt PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CM
if(WIN32) if(WIN32)
set_target_properties(${BINARY_NAME}-qt PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}") set_target_properties(${BINARY_NAME}-qt PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
if(NOT MSVC)
target_link_libraries(${BINARY_NAME}-qt -municode)
endif()
endif() endif()
list(APPEND QT_LIBRARIES Qt5::Widgets Qt5::Network) list(APPEND QT_LIBRARIES Qt5::Widgets Qt5::Network)

4
src/platform/test/cinema-main.c
View File

@ -715,7 +715,11 @@ static struct VDir* _makeOutDir(const char* testName) {
strncpy(pathEnd, testName, len); strncpy(pathEnd, testName, len);
pathEnd += len; pathEnd += len;
#ifndef _WIN32
mkdir(path, 0777); mkdir(path, 0777);
#else
mkdir(path);
#endif
if (!pos) { if (!pos) {
break; break;