AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-29 08:00:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.7.1-build-fixes' into 0.7.1

Browse Source 
# Conflicts:
#	components/CMakeLists.txt
This commit is contained in:
David Cernat 2020-02-10 08:45:16 +02:00
commit 491ccf21c5
7 changed files with 47 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -266,11 +266,13 @@ if(NOT HAVE_STDINT_H)
message(FATAL_ERROR "stdint.h was not found" ) message(FATAL_ERROR "stdint.h was not found" )
endif() endif()
if(BUILD_OPENMW OR BUILD_OPENCS OR BUILD_OPENMW_MP)
IF(BUILD_OPENMW OR BUILD_OPENCS)
find_package(OpenSceneGraph 3.3.4 REQUIRED osgDB osgViewer osgText osgGA osgParticle osgUtil osgFX osgShadow) find_package(OpenSceneGraph 3.3.4 REQUIRED osgDB osgViewer osgText osgGA osgParticle osgUtil osgFX osgShadow)
include_directories(SYSTEM ${OPENSCENEGRAPH_INCLUDE_DIRS}) include_directories(SYSTEM ${OPENSCENEGRAPH_INCLUDE_DIRS})
find_package(SDL2 REQUIRED)
endif()
IF(BUILD_OPENMW OR BUILD_OPENCS)
set(USED_OSG_PLUGINS set(USED_OSG_PLUGINS
osgdb_bmp osgdb_bmp
@ -315,7 +317,6 @@ IF(BUILD_OPENMW OR BUILD_OPENCS)
endif() endif()
find_package(MyGUI 3.2.2 REQUIRED) find_package(MyGUI 3.2.2 REQUIRED)
find_package(SDL2 REQUIRED)
find_package(OpenAL REQUIRED) find_package(OpenAL REQUIRED)
find_package(Bullet ${REQUIRED_BULLET_VERSION} REQUIRED COMPONENTS BulletCollision LinearMath) find_package(Bullet ${REQUIRED_BULLET_VERSION} REQUIRED COMPONENTS BulletCollision LinearMath)
ELSE() ELSE()
@ -650,7 +651,6 @@ endif(WIN32)
# Extern # Extern
IF(BUILD_OPENMW OR BUILD_OPENCS) IF(BUILD_OPENMW OR BUILD_OPENCS)
set(RECASTNAVIGATION_STATIC ON CACHE BOOL "Build recastnavigation static libraries") set(RECASTNAVIGATION_STATIC ON CACHE BOOL "Build recastnavigation static libraries")
add_subdirectory (extern/recastnavigation EXCLUDE_FROM_ALL) add_subdirectory (extern/recastnavigation EXCLUDE_FROM_ALL)
add_subdirectory (extern/osg-ffmpeg-videoplayer) add_subdirectory (extern/osg-ffmpeg-videoplayer)
add_subdirectory (extern/oics) add_subdirectory (extern/oics)

2
README.md
View File

@ -2,7 +2,7 @@ TES3MP
====== ======
Copyright (c) 2008-2015, OpenMW Team Copyright (c) 2008-2015, OpenMW Team
Copyright (c) 2016-2019, Stanislav Zhukov & David Cernat Copyright (c) 2016-2020, Stanislav Zhukov & David Cernat
[![Build Status](https://travis-ci.org/TES3MP/openmw-tes3mp.svg?branch=0.7.0)](https://travis-ci.org/TES3MP/openmw-tes3mp) [![Build Status](https://travis-ci.org/TES3MP/openmw-tes3mp.svg?branch=0.7.0)](https://travis-ci.org/TES3MP/openmw-tes3mp)

1
cmake/FindLuaJit.cmake
View File

@ -7,6 +7,7 @@ include(LibFindMacros)
libfind_pkg_detect(LuaJit luajit libfind_pkg_detect(LuaJit luajit
FIND_PATH luajit.h FIND_PATH luajit.h
PATH_SUFFIXES luajit
FIND_LIBRARY NAMES luajit-5.1 luajit FIND_LIBRARY NAMES luajit-5.1 luajit
) )

2
cmake/FindRakNet.cmake
View File

@ -18,7 +18,7 @@ FIND_LIBRARY (RakNet_LIBRARY_RELEASE NAMES RakNetLibStatic
$ENV{RAKNET_ROOT}/lib $ENV{RAKNET_ROOT}/lib
) )
FIND_LIBRARY (RakNet_LIBRARY_DEBUG NAMES RakNetLibStatic FIND_LIBRARY (RakNet_LIBRARY_DEBUG NAMES RakNetLibStaticd
PATHS PATHS
ENV LD_LIBRARY_PATH ENV LD_LIBRARY_PATH
ENV LIBRARY_PATH ENV LIBRARY_PATH

1
cmake/FindSDL2.cmake
View File

@ -60,6 +60,7 @@
# (To distribute this file outside of CMake, substitute the full # (To distribute this file outside of CMake, substitute the full
# License text for the above reference.) # License text for the above reference.)
include(LibFindMacros)
if (CMAKE_SIZEOF_VOID_P EQUAL 8) if (CMAKE_SIZEOF_VOID_P EQUAL 8)
set(_sdl_lib_suffix lib/x64) set(_sdl_lib_suffix lib/x64)

13
components/CMakeLists.txt
View File

@ -95,6 +95,7 @@ add_component_dir (debug
debugging debuglog debugging debuglog
) )
IF(NOT WIN32 AND NOT APPLE) IF(NOT WIN32 AND NOT APPLE)
add_definitions(-DGLOBAL_DATA_PATH="${GLOBAL_DATA_PATH}") add_definitions(-DGLOBAL_DATA_PATH="${GLOBAL_DATA_PATH}")
add_definitions(-DGLOBAL_CONFIG_PATH="${GLOBAL_CONFIG_PATH}") add_definitions(-DGLOBAL_CONFIG_PATH="${GLOBAL_CONFIG_PATH}")
@ -223,11 +224,14 @@ add_component_dir (fallback
) )
if(NOT WIN32 AND NOT ANDROID) if(NOT WIN32 AND NOT ANDROID)
if (BUILD_OPENMW OR BUILD_OPENCS)
add_component_dir (crashcatcher add_component_dir (crashcatcher
crashcatcher crashcatcher
) )
endif() endif()
endif()
if (BUILD_OPENMW OR BUILD_OPENCS)
add_component_dir(detournavigator add_component_dir(detournavigator
debug debug
makenavmesh makenavmesh
@ -247,6 +251,7 @@ add_component_dir(detournavigator
navigator navigator
findrandompointaroundcircle findrandompointaroundcircle
) )
endif()
set (ESM_UI ${CMAKE_SOURCE_DIR}/files/ui/contentselector.ui set (ESM_UI ${CMAKE_SOURCE_DIR}/files/ui/contentselector.ui
) )
@ -310,10 +315,14 @@ target_link_libraries(components
${OPENGL_gl_LIBRARY} ${OPENGL_gl_LIBRARY}
${MyGUI_LIBRARIES} ${MyGUI_LIBRARIES}
${BSAOPTHASH_LIBRARIES} ${BSAOPTHASH_LIBRARIES}
)
if (BUILD_OPENMW OR BUILD_OPENCS)
target_link_libraries(components
RecastNavigation::DebugUtils RecastNavigation::DebugUtils
RecastNavigation::Detour RecastNavigation::Detour
RecastNavigation::Recast RecastNavigation::Recast)
) endif ()
if (WIN32) if (WIN32)
target_link_libraries(components target_link_libraries(components

1
components/openmw-mp/Base/BasePacketProcessor.hpp
View File

@ -4,6 +4,7 @@
#include <string> #include <string>
#include <memory> #include <memory>
#include <unordered_map> #include <unordered_map>
#include <stdexcept>
#define BPP_INIT(packet_id) packetID = packet_id; strPacketID = #packet_id; className = typeid(this).name(); avoidReading = false; #define BPP_INIT(packet_id) packetID = packet_id; strPacketID = #packet_id; className = typeid(this).name(); avoidReading = false;