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

whitespace clean

This commit is contained in:
Alam Ed Arias 2016-02-25 18:28:48 -05:00
parent aa4414d706
commit 8a369d969b
7 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -23,13 +23,13 @@ endfunction()
# Macro to add OSX framework # Macro to add OSX framework
macro(add_framework fwname appname) macro(add_framework fwname appname)
find_library(FRAMEWORK_${fwname} find_library(FRAMEWORK_${fwname}
NAMES ${fwname} NAMES ${fwname}
PATHS ${CMAKE_OSX_SYSROOT}/System/Library PATHS ${CMAKE_OSX_SYSROOT}/System/Library
${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")
else() else()

2
cmake/Modules/FindSDL2.cmake
View File

@ -1,6 +1,6 @@
# Find SDL2 # Find SDL2
# Once done, this will define # Once done, this will define
# #
# SDL2_FOUND - system has SDL2 # SDL2_FOUND - system has SDL2
# SDL2_INCLUDE_DIRS - SDL2 include directories # SDL2_INCLUDE_DIRS - SDL2 include directories
# SDL2_LIBRARIES - link libraries # SDL2_LIBRARIES - link libraries

2
cmake/Modules/FindSDL2_main.cmake
View File

@ -1,6 +1,6 @@
# Find SDL2 # Find SDL2
# Once done, this will define # Once done, this will define
# #
# SDL2_MAIN_FOUND - system has SDL2 # SDL2_MAIN_FOUND - system has SDL2
# SDL2_MAIN_INCLUDE_DIRS - SDL2 include directories # SDL2_MAIN_INCLUDE_DIRS - SDL2 include directories
# SDL2_MAIN_LIBRARIES - link libraries # SDL2_MAIN_LIBRARIES - link libraries

2
cmake/Modules/FindSDL2_mixer.cmake
View File

@ -1,6 +1,6 @@
# Find SDL2 # Find SDL2
# Once done, this will define # Once done, this will define
# #
# SDL2_MIXER_FOUND - system has SDL2 # SDL2_MIXER_FOUND - system has SDL2
# SDL2_MIXER_INCLUDE_DIRS - SDL2 include directories # SDL2_MIXER_INCLUDE_DIRS - SDL2 include directories
# SDL2_MIXER_LIBRARIES - link libraries # SDL2_MIXER_LIBRARIES - link libraries

8
cmake/Modules/LibFindMacros.cmake
View File

@ -123,7 +123,7 @@ function (libfind_process PREFIX)
set(includeopts ${${PREFIX}_PROCESS_INCLUDES}) set(includeopts ${${PREFIX}_PROCESS_INCLUDES})
set(libraryopts ${${PREFIX}_PROCESS_LIBS}) set(libraryopts ${${PREFIX}_PROCESS_LIBS})
# Process deps to add to # Process deps to add to
foreach (i ${PREFIX} ${${PREFIX}_DEPENDENCIES}) foreach (i ${PREFIX} ${${PREFIX}_DEPENDENCIES})
if (DEFINED ${i}_INCLUDE_OPTS OR DEFINED ${i}_LIBRARY_OPTS) if (DEFINED ${i}_INCLUDE_OPTS OR DEFINED ${i}_LIBRARY_OPTS)
# The package seems to export option lists that we can use, woohoo! # The package seems to export option lists that we can use, woohoo!
@ -146,11 +146,11 @@ function (libfind_process PREFIX)
endif() endif()
endif() endif()
endforeach() endforeach()
if (includeopts) if (includeopts)
list(REMOVE_DUPLICATES includeopts) list(REMOVE_DUPLICATES includeopts)
endif() endif()
if (libraryopts) if (libraryopts)
list(REMOVE_DUPLICATES libraryopts) list(REMOVE_DUPLICATES libraryopts)
endif() endif()
@ -215,7 +215,7 @@ function (libfind_process PREFIX)
set (${PREFIX}_LIBRARIES ${libs} PARENT_SCOPE) set (${PREFIX}_LIBRARIES ${libs} PARENT_SCOPE)
set (${PREFIX}_FOUND TRUE PARENT_SCOPE) set (${PREFIX}_FOUND TRUE PARENT_SCOPE)
endif() endif()
return() return()
endif() endif()
# Format messages for debug info and the type of error # Format messages for debug info and the type of error

2
src/sdl/CMakeLists.txt
View File

@ -57,7 +57,7 @@ if(${SDL2_FOUND})
${SRB2_SDL2_SOURCES} ${SRB2_SDL2_SOURCES}
${SRB2_SDL2_HEADERS} ${SRB2_SDL2_HEADERS}
) )
source_group("Main" FILES ${SRB2_CORE_SOURCES} ${SRB2_CORE_HEADERS}) source_group("Main" FILES ${SRB2_CORE_SOURCES} ${SRB2_CORE_HEADERS})
source_group("Renderer" FILES ${SRB2_CORE_RENDER_SOURCES}) source_group("Renderer" FILES ${SRB2_CORE_RENDER_SOURCES})
source_group("Game" FILES ${SRB2_CORE_GAME_SOURCES}) source_group("Game" FILES ${SRB2_CORE_GAME_SOURCES})

7
src/sdl/i_system.c
View File

@ -2756,8 +2756,8 @@ static const char *locateWad(void)
if (isWadPathOk(returnWadPath)) if (isWadPathOk(returnWadPath))
return NULL; return NULL;
#endif #endif
#ifdef CMAKECONFIG #ifdef CMAKECONFIG
#ifndef NDEBUG #ifndef NDEBUG
I_OutputMsg(","CMAKE_ASSETS_DIR); I_OutputMsg(","CMAKE_ASSETS_DIR);
@ -2768,7 +2768,7 @@ static const char *locateWad(void)
} }
#endif #endif
#endif #endif
#ifdef __APPLE__ #ifdef __APPLE__
OSX_GetResourcesPath(returnWadPath); OSX_GetResourcesPath(returnWadPath);
I_OutputMsg(",%s", returnWadPath); I_OutputMsg(",%s", returnWadPath);
@ -2776,7 +2776,6 @@ static const char *locateWad(void)
{ {
return returnWadPath; return returnWadPath;
} }
#endif #endif
// examine default dirs // examine default dirs