otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

part 3

Browse source 
issue #685
This commit is contained in:
tildearrow 2022-12-28 16:07:01 -05:00
parent cb70759a68
commit fbb712ddc9
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -622,15 +622,13 @@ src/gui/volMeter.cpp
src/gui/gui.cpp src/gui/gui.cpp
) )
if (WIN32 OR APPLE) if (WIN32 AND CMAKE_SIZEOF_VOID_P EQUAL 8)
list(APPEND GUI_SOURCES extern/nfd-modified/src/nfd_common.cpp) list(APPEND GUI_SOURCES extern/nfd-modified/src/nfd_common.cpp)
endif()
if (WIN32)
list(APPEND GUI_SOURCES extern/nfd-modified/src/nfd_win.cpp) list(APPEND GUI_SOURCES extern/nfd-modified/src/nfd_win.cpp)
endif() endif()
if (APPLE) if (APPLE)
list(APPEND GUI_SOURCES extern/nfd-modified/src/nfd_common.cpp)
list(APPEND GUI_SOURCES src/gui/macstuff.m) list(APPEND GUI_SOURCES src/gui/macstuff.m)
list(APPEND GUI_SOURCES extern/nfd-modified/src/nfd_cocoa.mm) list(APPEND GUI_SOURCES extern/nfd-modified/src/nfd_cocoa.mm)
endif() endif()

8
extern/nfd-modified/src/nfd_win.cpp vendored
View file

@ -5,11 +5,11 @@
*/ */
//#ifdef __MINGW32__ #ifdef __MINGW32__
// Explicitly setting NTDDI version, this is necessary for the MinGW compiler // Explicitly setting NTDDI version, this is necessary for the MinGW compiler
//#define NTDDI_VERSION NTDDI_VISTA #define NTDDI_VERSION NTDDI_VISTA
//#define _WIN32_WINNT _WIN32_WINNT_VISTA #define _WIN32_WINNT _WIN32_WINNT_VISTA
//#endif #endif
#define _CRTDBG_MAP_ALLOC #define _CRTDBG_MAP_ALLOC
#include <stdlib.h> #include <stdlib.h>

2
src/gui/fileDialog.h
View file

@ -3,7 +3,7 @@
#include <functional> #include <functional>
#include <vector> #include <vector>
#if defined(_WIN32) || defined(__APPLE__) #if defined(_WIN64) || defined(__APPLE__)
#define USE_NFD #define USE_NFD
#endif #endif