Mercurial > minori

diff dep/animia/src/main.cpp @ 97:18979b066284

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
animia/unix: fix a bunch of stuff that breaks OS X things
author Paper <mrpapersonic@gmail.com>
date Thu, 02 Nov 2023 13:14:15 -0400
parents 4c6dd5999b39
children 582b2fca1561
line wrap: on
line diff
--- a/dep/animia/src/main.cpp	Wed Nov 01 15:16:49 2023 -0400
+++ b/dep/animia/src/main.cpp	Thu Nov 02 13:14:15 2023 -0400
@@ -1,16 +1,10 @@
 #include "bsd.h"
+#include "os.h"
 #include "linux.h"
 #include "win32.h"
 #include <string>
 #include <unordered_map>
 #include <vector>
-#ifdef __linux__
-#	define ON_LINUX
-#elif (defined(unix) || defined(__unix__) || defined(__unix) || (defined(__APPLE__) && defined(__MACH__)))
-#	define ON_UNIX
-#elif defined(_WIN32)
-#	define ON_WINDOWS
-#endif
 
 namespace Animia {
 
@@ -53,6 +47,8 @@
 std::vector<std::string> filter_system_files(const std::vector<std::string>& source) {
 #ifdef ON_WINDOWS
 	return Windows::filter_system_files(source);
+#elif defined(ON_OSX)
+	return Unix::filter_system_files(source);
 #else
 	return source;
 #endif