Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next

# Conflicts: # src/sdl/i_system.c
2016-02-25 15:41:13 -08:00 · 2016-02-25 15:41:13 -08:00 · 8b7e0347fd
parent 5108bb97f4 8a369d969b
commit 8b7e0347fd
7 changed files with 15 additions and 16 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -28,7 +28,7 @@ macro(add_framework fwname appname)
 		${CMAKE_OSX_SYSROOT}/Library
 		/System/Library
 		/Library
-    	PATH_SUFFIXES Frameworks
+	ATH_SUFFIXES Frameworks
 	NO_DEFAULT_PATH)
    if( ${FRAMEWORK_${fwname}} STREQUAL FRAMEWORK_${fwname}-NOTFOUND)
        MESSAGE(ERROR ": Framework ${fwname} not found")
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@ -2776,7 +2776,6 @@ static const char *locateWad(void)
    {
        return returnWadPath;
    }
-
 #endif

 	// examine default dirs