lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
# Conflicts:
#	src/sdl/i_system.c
This commit is contained in:
Inuyasha 2016-02-25 15:41:13 -08:00
parent 5108bb97f4 8a369d969b
commit 8b7e0347fd
7 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -28,7 +28,7 @@ macro(add_framework fwname appname)
${CMAKE_OSX_SYSROOT}/Library ${CMAKE_OSX_SYSROOT}/Library
/System/Library /System/Library
/Library /Library
PATH_SUFFIXES Frameworks ATH_SUFFIXES Frameworks
NO_DEFAULT_PATH) NO_DEFAULT_PATH)
if( ${FRAMEWORK_${fwname}} STREQUAL FRAMEWORK_${fwname}-NOTFOUND) if( ${FRAMEWORK_${fwname}} STREQUAL FRAMEWORK_${fwname}-NOTFOUND)
MESSAGE(ERROR ": Framework ${fwname} not found") MESSAGE(ERROR ": Framework ${fwname} not found")

1
src/sdl/i_system.c
View file

@ -2776,7 +2776,6 @@ static const char *locateWad(void)
{ {
return returnWadPath; return returnWadPath;
} }
#endif #endif
// examine default dirs // examine default dirs