a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-22 23:40:01 +00:00
Code Issues Projects Releases Wiki Activity

cmake: make librw non-vendorable + rename Findmpg123 + create targets for dependencies

Browse source
This commit is contained in:
Anonymous Maarten 2020-12-06 13:54:06 +01:00 committed by shfil
parent 8a157eee0a
commit 2ff9270279
6 changed files with 136 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
CMakeLists.txt
View file

@ -23,12 +23,17 @@ if(RE3_INSTALL)
set(RE3_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/re3") set(RE3_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/re3")
endif() endif()
add_subdirectory("vendor/librw") option(RE3_VENDORED_LIBRW "Use vendored librw" ON)
if(RE3_VENDORED_LIBRW)
add_subdirectory(vendor/librw)
else()
find_package(librw REQUIRED)
endif()
add_subdirectory(src) add_subdirectory(src)
if(RE3_INSTALL) if(RE3_INSTALL)
include(CMakePackageConfigHelpers) include(CMakePackageConfigHelpers)
configure_package_config_file(re3-config.cmake.in re3-config.cmake configure_package_config_file(cmake/re3-config.cmake.in re3-config.cmake
INSTALL_DESTINATION "${CMAKE_INSTALL_PREFIX}" INSTALL_DESTINATION "${CMAKE_INSTALL_PREFIX}"
) )
install( install(
@ -40,5 +45,15 @@ if(RE3_INSTALL)
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
) )
include(CMakeCPack.cmake) set(CPACK_PACKAGE_NAME "${CMAKE_PROJECT_NAME}")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "GTA III reversed")
set(CPACK_PACKAGE_VENDOR "GTAModding")
#FIXME: missing license (https://github.com/GTAmodding/re3/issues/794)
#set(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/LICENSE")
#set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}")
set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}")
set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}")
include(CPack)
endif() endif()

28
cmake/FindMPG123.cmake
View file

@ -1,28 +0,0 @@
# - Find mpg123
# Find the native mpg123 includes and library
#
# MPG123_INCLUDE_DIR - where to find mpg123.h
# MPG123_LIBRARIES - List of libraries when using mpg123.
# MPG123_FOUND - True if mpg123 found.
IF(MPG123_INCLUDE_DIR AND MPG123_LIBRARIES)
# Already in cache, be silent
SET(MPG123_FIND_QUIETLY TRUE)
ENDIF(MPG123_INCLUDE_DIR AND MPG123_LIBRARIES)
FIND_PATH(MPG123_INCLUDE_DIR mpg123.h
PATHS "${MPG123_DIR}"
PATH_SUFFIXES include
)
FIND_LIBRARY(MPG123_LIBRARIES NAMES mpg123 mpg123-0
PATHS "${MPG123_DIR}"
PATH_SUFFIXES lib
)
# MARK_AS_ADVANCED(MPG123_LIBRARIES MPG123_INCLUDE_DIR)
# handle the QUIETLY and REQUIRED arguments and set MPG123_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPG123 DEFAULT_MSG MPG123_LIBRARIES MPG123_INCLUDE_DIR)

47
cmake/FindSndFile.cmake
View file

@ -7,6 +7,8 @@
# SNDFILE_FOUND - system has libsndfile # SNDFILE_FOUND - system has libsndfile
# SNDFILE_INCLUDE_DIRS - the libsndfile include directory # SNDFILE_INCLUDE_DIRS - the libsndfile include directory
# SNDFILE_LIBRARIES - Link these to use libsndfile # SNDFILE_LIBRARIES - Link these to use libsndfile
# SNDFILE_CFLAGS - Compile options to use libsndfile
# SndFile::SNdFile - Imported library of libsndfile
# #
# Copyright (C) 2006 Wengo # Copyright (C) 2006 Wengo
# #
@ -15,14 +17,16 @@
# For details see the accompanying COPYING-CMAKE-SCRIPTS file. # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
# #
if (SNDFILE_LIBRARIES AND SNDFILE_INCLUDE_DIRS) find_package(PkgConfig QUIET)
# in cache already if(PKG_CONFIG_FOUND)
set(SNDFILE_FOUND TRUE) pkg_search_module(PKG_SNDFILE "sndfile")
else (SNDFILE_LIBRARIES AND SNDFILE_INCLUDE_DIRS) endif()
find_path(SNDFILE_INCLUDE_DIR find_path(SNDFILE_INCLUDE_DIR
NAMES NAMES
sndfile.h sndfile.h
HINTS
${PKG_SNDFILE_INCLUDE_DIRS}
PATHS PATHS
/usr/include /usr/include
/usr/local/include /usr/local/include
@ -33,6 +37,8 @@ else (SNDFILE_LIBRARIES AND SNDFILE_INCLUDE_DIRS)
find_library(SNDFILE_LIBRARY find_library(SNDFILE_LIBRARY
NAMES NAMES
sndfile sndfile
HINTS
${PKG_SNDFILE_LIBRARIES}
PATHS PATHS
/usr/lib /usr/lib
/usr/local/lib /usr/local/lib
@ -40,28 +46,25 @@ else (SNDFILE_LIBRARIES AND SNDFILE_INCLUDE_DIRS)
/sw/lib /sw/lib
) )
set(SNDFILE_INCLUDE_DIRS set(SNDFILE_CFLAGS "${PKG_SNDFILE_CFLAGS_OTHER}" CACHE STRING "CFLAGS of libsndfile")
${SNDFILE_INCLUDE_DIR}
) set(SNDFILE_INCLUDE_DIRS ${SNDFILE_INCLUDE_DIR})
set(SNDFILE_LIBRARIES set(SNDFILE_LIBRARIES ${SNDFILE_LIBRARY})
${SNDFILE_LIBRARY}
)
if (SNDFILE_INCLUDE_DIRS AND SNDFILE_LIBRARIES) if (SNDFILE_INCLUDE_DIRS AND SNDFILE_LIBRARIES)
set(SNDFILE_FOUND TRUE) set(SNDFILE_FOUND TRUE)
endif (SNDFILE_INCLUDE_DIRS AND SNDFILE_LIBRARIES) endif (SNDFILE_INCLUDE_DIRS AND SNDFILE_LIBRARIES)
if (SNDFILE_FOUND)
if (NOT SndFile_FIND_QUIETLY)
message(STATUS "Found libsndfile: ${SNDFILE_LIBRARIES}")
endif (NOT SndFile_FIND_QUIETLY)
else (SNDFILE_FOUND)
if (SndFile_FIND_REQUIRED)
message(FATAL_ERROR "Could not find libsndfile")
endif (SndFile_FIND_REQUIRED)
endif (SNDFILE_FOUND)
# show the SNDFILE_INCLUDE_DIRS and SNDFILE_LIBRARIES variables only in the advanced view # handle the QUIETLY and REQUIRED arguments and set SNdFile_FOUND to TRUE if
mark_as_advanced(SNDFILE_INCLUDE_DIRS SNDFILE_LIBRARIES) # all listed variables are TRUE
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(SndFile DEFAULT_MSG SNDFILE_INCLUDE_DIRS SNDFILE_LIBRARIES)
endif (SNDFILE_LIBRARIES AND SNDFILE_INCLUDE_DIRS) if(NOT TARGET SndFile::SndFile)
add_library(__SndFile INTERFACE)
target_compile_options(__SndFile INTERFACE ${SNDFILE_CFLAGS})
target_include_directories(__SndFile INTERFACE ${SNDFILE_INCLUDE_DIRS})
target_link_libraries(__SndFile INTERFACE ${SNDFILE_LIBRARIES})
add_library(SndFile::SndFile ALIAS __SndFile)
endif()

40
cmake/Findmpg123.cmake Normal file
View file

@ -0,0 +1,40 @@
# - Find mpg123
# Find the native mpg123 includes and library
#
# mpg123_INCLUDE_DIR - Where to find mpg123.h
# mpg123_LIBRARIES - List of libraries when using mpg123.
# mpg123_CFLAGS - Compile options to use mpg123
# mpg123_FOUND - True if mpg123 found.
# MPG123::libmpg123 - Imported library of libmpg123
find_package(PkgConfig QUIET)
if(PKG_CONFIG_FOUND)
pkg_search_module(PKG_MPG123 mpg123)
endif()
find_path(mpg123_INCLUDE_DIR mpg123.h
HINTS ${PKG_MPG123_INCLUDE_DIRS}
PATHS "${mpg123_DIR}"
PATH_SUFFIXES include
)
find_library(mpg123_LIBRARIES NAMES mpg123 mpg123-0
HINTS ${PKG_MPG123_LIBRARIES}
PATHS "${mpg123_DIR}"
PATH_SUFFIXES lib
)
set(mpg123_CFLAGS "${PKG_MPG123_CFLAGS_OTHER}" CACHE STRING "CFLAGS of mpg123")
# handle the QUIETLY and REQUIRED arguments and set mpg123_FOUND to TRUE if
# all listed variables are TRUE
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(mpg123 DEFAULT_MSG mpg123_LIBRARIES mpg123_INCLUDE_DIR)
if(NOT TARGET MPG123::libmpg123)
add_library(__libmpg123 INTERFACE)
target_compile_options(__libmpg123 INTERFACE ${mpg123_CFLAGS})
target_include_directories(__libmpg123 INTERFACE ${mpg123_INCLUDE_DIR})
target_link_libraries(__libmpg123 INTERFACE ${mpg123_LIBRARIES})
add_library(MPG123::libmpg123 ALIAS __libmpg123)
endif()

5
cmake/re3-config.cmake.in Normal file
View file

@ -0,0 +1,5 @@
include("${CMAKE_CURRENT_LIST_DIR}/re3-targets.cmake")
set(RE3_AUDIO "@RE3_AUDIO@")
set(RE3_AUDIOS "@RE3_AUDIOS@")
set(RE3_PLATFORM @LIBRW_PLATFORM@)

75
src/CMakeLists.txt
View file

@ -3,65 +3,48 @@ find_package(Threads REQUIRED)
if(${RE3_AUDIO} STREQUAL "OAL") if(${RE3_AUDIO} STREQUAL "OAL")
find_package(OpenAL REQUIRED) find_package(OpenAL REQUIRED)
find_package(MPG123 REQUIRED) find_package(mpg123 REQUIRED)
find_package(SndFile REQUIRED) find_package(SndFile REQUIRED)
endif() endif()
file(GLOB_RECURSE Sources "*.cpp" "*.h") file(GLOB_RECURSE RE3_SOURCES "*.cpp" "*.h")
MACRO(HEADER_DIRECTORIES return_list) function(header_directories RETURN_LIST)
FILE(GLOB_RECURSE new_list *.cpp) file(GLOB_RECURSE ALL_SRCS *.h *.cpp *.c)
SET(dir_list "animation" set(RELDIRS)
"audio" foreach(SRC ${ALL_SRCS})
"collision" file(RELATIVE_PATH RELSRC "${CMAKE_CURRENT_SOURCE_DIR}" "${SRC}")
"control" get_filename_component(RELDIR "${RELSRC}" DIRECTORY)
"core" list(APPEND RELDIRS ${RELDIR})
"entities" endforeach()
"extras" list(REMOVE_DUPLICATES RELDIRS)
"fakerw" set(${RETURN_LIST} ${RELDIRS} PARENT_SCOPE)
"math" endfunction()
"modelinfo"
"objects"
"peds"
"render"
"rw"
"save"
"skel"
"text"
"vehicles"
"weapons")
FOREACH(file_path ${new_list})
GET_FILENAME_COMPONENT(dir_path ${file_path} PATH)
SET(dir_list ${dir_list} ${dir_path})
ENDFOREACH()
LIST(REMOVE_DUPLICATES dir_list)
SET(${return_list} ${dir_list})
ENDMACRO()
HEADER_DIRECTORIES(header_list) header_directories(RE3_INCLUDES)
include_directories(${header_list}) include_directories(${RE3_INCLUDES})
add_executable(re3 ${RE3_SOURCES})
target_link_libraries(re3 PRIVATE
librw::librw
Threads::Threads
)
add_executable(re3 ${Sources}) if(RE3_AUDIO STREQUAL "OAL")
target_link_libraries(re3 librw) target_link_libraries(re3 PRIVATE ${OPENAL_LIBRARY})
target_link_libraries(re3 Threads::Threads) target_link_libraries(re3 PRIVATE MPG123::libmpg123)
target_link_libraries(re3 PRIVATE SndFile::SndFile)
if(${RE3_AUDIO} STREQUAL "OAL")
target_link_libraries(re3 ${OPENAL_LIBRARY})
target_link_libraries(re3 ${MPG123_LIBRARIES})
target_link_libraries(re3 ${SNDFILE_LIBRARIES})
endif() endif()
target_include_directories(re3 target_include_directories(re3
INTERFACE INTERFACE
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}> $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${RE3_INSTALL_INCLUDEDIR}>
) )
target_compile_definitions(re3 target_compile_definitions(re3
PRIVATE PRIVATE
"$<IF:$<CONFIG:DEBUG>,DEBUG,NDEBUG>" "$<IF:$<CONFIG:DEBUG>,DEBUG,NDEBUG>"
PUBLIC
"RW_${RE3_PLATFORM}"
) )
target_compile_definitions(re3 PRIVATE LIBRW=1 AUDIO_OAL=1) target_compile_definitions(re3 PRIVATE LIBRW=1 AUDIO_OAL=1)
@ -71,7 +54,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang
PRIVATE PRIVATE
"-Wall" "-Wall"
) )
if (NOT RE3_PLATFORM_PS2) if (NOT LIBRW_PLATFORM_PS2)
target_compile_options(re3 target_compile_options(re3
PRIVATE PRIVATE
"-Wextra" "-Wextra"
@ -94,15 +77,9 @@ set_target_properties(re3
CXX_STANDARD 11 CXX_STANDARD 11
CXX_EXTENSIONS OFF CXX_EXTENSIONS OFF
CXX_STANDARD_REQUIRED ON CXX_STANDARD_REQUIRED ON
PREFIX ""
) )
if(RE3_INSTALL) if(RE3_INSTALL)
target_include_directories(re3
INTERFACE
$<INSTALL_INTERFACE:${RE3_INSTALL_INCLUDEDIR}>
)
install( install(
TARGETS re3 TARGETS re3
EXPORT re3-targets EXPORT re3-targets