From 989662774e16964c01d56c5bfbd7df0fffa7a78f Mon Sep 17 00:00:00 2001 From: Azaezel Date: Tue, 1 Jan 2019 11:00:05 -0600 Subject: [PATCH] blacklist updated to filter out the new zenity backend when on windows. likely need to do the same on mac and potentially resolve conflicts on linux --- Tools/CMake/torque3d.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/CMake/torque3d.cmake b/Tools/CMake/torque3d.cmake index 751c908d8..ec3eb110e 100644 --- a/Tools/CMake/torque3d.cmake +++ b/Tools/CMake/torque3d.cmake @@ -470,7 +470,7 @@ if(TORQUE_SDL) addLib(nativeFileDialogs) set(BLACKLIST "" ) else() - set(BLACKLIST "nfd_gtk.c" "nfd_cocoa.m" ) + set(BLACKLIST "nfd_gtk.c" "nfd_cocoa.m" "simple_exec.h" "nfd_zenity.c") addLib(nativeFileDialogs) set(BLACKLIST "" ) addLib(comctl32)