mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-30 16:15:31 +00:00
Code Issues Releases Wiki Activity

[General] Fix CMake errors

Browse source
This commit is contained in:
Koncord 2017-05-25 23:56:22 +08:00
parent cb5e88ce5c
commit 056ec2d434
3 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/CMakeLists.txt
View file

@ -101,12 +101,12 @@ add_openmw_dir (mwmp Main Networking LocalPlayer DedicatedPlayer PlayerList Loca
BaseClientPacketProcessor PlayerProcessor WorldProcessor ActorProcessor ProcessorInitializer BaseClientPacketProcessor PlayerProcessor WorldProcessor ActorProcessor ProcessorInitializer
) )
add_openmw_dir (mwmp\\processors\\actor ProcessorActorAnimFlags ProcessorActorAnimPlay ProcessorActorAttack add_openmw_dir (mwmp/processors/actor ProcessorActorAnimFlags ProcessorActorAnimPlay ProcessorActorAttack
ProcessorActorAuthority ProcessorActorCellChange ProcessorActorEquipment ProcessorActorList ProcessorActorPosition ProcessorActorAuthority ProcessorActorCellChange ProcessorActorEquipment ProcessorActorList ProcessorActorPosition
ProcessorActorSpeech ProcessorActorStatsDynamic ProcessorActorTest ProcessorActorSpeech ProcessorActorStatsDynamic ProcessorActorTest
) )
add_openmw_dir (mwmp\\processors\\player ProcessorChatMessage ProcessorGameConsole ProcessorGameTime ProcessorGUIMessageBox add_openmw_dir (mwmp/processors/player ProcessorChatMessage ProcessorGameConsole ProcessorGameTime ProcessorGUIMessageBox
ProcessorHandshake ProcessorUserDisconnected ProcessorUserMyID ProcessorPlayerBaseInfo ProcessorPlayerAnimFlags ProcessorHandshake ProcessorUserDisconnected ProcessorUserMyID ProcessorPlayerBaseInfo ProcessorPlayerAnimFlags
ProcessorPlayerAttack ProcessorPlayerAttribute ProcessorPlayerBounty ProcessorPlayerCellChange ProcessorPlayerCellState ProcessorPlayerAttack ProcessorPlayerAttribute ProcessorPlayerBounty ProcessorPlayerCellChange ProcessorPlayerCellState
ProcessorPlayerCharClass ProcessorPlayerCharGen ProcessorPlayerDeath ProcessorPlayerEquipment ProcessorPlayerFaction ProcessorPlayerCharClass ProcessorPlayerCharGen ProcessorPlayerDeath ProcessorPlayerEquipment ProcessorPlayerFaction
@ -114,7 +114,7 @@ add_openmw_dir (mwmp\\processors\\player ProcessorChatMessage ProcessorGameConso
ProcessorPlayerSkill ProcessorPlayerSpellbook ProcessorPlayerStatsDynamic ProcessorPlayerTopic ProcessorPlayerSkill ProcessorPlayerSpellbook ProcessorPlayerStatsDynamic ProcessorPlayerTopic
) )
add_openmw_dir (mwmp\\processors\\world BaseObjectProcessor ProcessorContainer ProcessorDoorState ProcessorMusicPlay add_openmw_dir (mwmp/processors/world BaseObjectProcessor ProcessorContainer ProcessorDoorState ProcessorMusicPlay
ProcessorObjectAnimPlay ProcessorObjectDelete ProcessorObjectLock ProcessorObjectMove ProcessorObjectPlace ProcessorObjectAnimPlay ProcessorObjectDelete ProcessorObjectLock ProcessorObjectMove ProcessorObjectPlace
ProcessorObjectRotate ProcessorObjectScale ProcessorObjectTrap ProcessorScriptGlobalShort ProcessorScriptLocalFloat ProcessorObjectRotate ProcessorObjectScale ProcessorObjectTrap ProcessorScriptGlobalShort ProcessorScriptLocalFloat
ProcessorScriptLocalShort ProcessorScriptMemberShort ProcessorVideoPlay ProcessorScriptLocalShort ProcessorScriptMemberShort ProcessorVideoPlay

16
cmake/OpenMWMacros.cmake
View file

@ -20,18 +20,17 @@ macro (add_openmw_dir dir)
set (files) set (files)
set (cppfiles) set (cppfiles)
string(REGEX REPLACE "\\\\" "/" newDir ${dir})
foreach (u ${ARGN}) foreach (u ${ARGN})
# Add cpp and hpp to OPENMW_FILES # Add cpp and hpp to OPENMW_FILES
file (GLOB ALL "${newDir}/${u}.[ch]pp") file (GLOB ALL "${dir}/${u}.[ch]pp")
foreach (f ${ALL}) foreach (f ${ALL})
list (APPEND files "${f}") list (APPEND files "${f}")
list (APPEND OPENMW_FILES "${f}") list (APPEND OPENMW_FILES "${f}")
endforeach (f) endforeach (f)
# Add cpp to unity build # Add cpp to unity build
file (GLOB ALL "${newDir}/${u}.cpp") file (GLOB ALL "${dir}/${u}.cpp")
foreach (f ${ALL}) foreach (f ${ALL})
list (APPEND cppfiles "${f}") list (APPEND cppfiles "${f}")
endforeach (f) endforeach (f)
@ -43,16 +42,16 @@ macro (add_openmw_dir dir)
list (APPEND OPENMW_FILES ${CMAKE_CURRENT_BINARY_DIR}/ub_${newDir}.cpp) list (APPEND OPENMW_FILES ${CMAKE_CURRENT_BINARY_DIR}/ub_${newDir}.cpp)
endif() endif()
source_group ("apps\\openmw\\${dir}" FILES ${files}) string(REGEX REPLACE "/" "\\\\" newDir ${dir})
source_group ("apps\\openmw\\${newDir}" FILES ${files})
endmacro (add_openmw_dir) endmacro (add_openmw_dir)
macro (add_component_dir dir) macro (add_component_dir dir)
set (files) set (files)
set (cppfiles) set (cppfiles)
string(REGEX REPLACE "\\\\" "/" newDir ${dir})
foreach (u ${ARGN}) foreach (u ${ARGN})
file (GLOB ALL "${newDir}/${u}.[ch]pp") file (GLOB ALL "${dir}/${u}.[ch]pp")
foreach (f ${ALL}) foreach (f ${ALL})
list (APPEND files "${f}") list (APPEND files "${f}")
@ -60,7 +59,7 @@ macro (add_component_dir dir)
endforeach (f) endforeach (f)
# Add cpp to unity build # Add cpp to unity build
file (GLOB ALL "${newDir}/${u}.cpp") file (GLOB ALL "${dir}/${u}.cpp")
foreach (f ${ALL}) foreach (f ${ALL})
list (APPEND cppfiles "${f}") list (APPEND cppfiles "${f}")
endforeach (f) endforeach (f)
@ -72,7 +71,8 @@ macro (add_component_dir dir)
list (APPEND COMPONENT_FILES ${CMAKE_CURRENT_BINARY_DIR}/ub_${newDir}.cpp) list (APPEND COMPONENT_FILES ${CMAKE_CURRENT_BINARY_DIR}/ub_${newDir}.cpp)
endif() endif()
source_group ("components\\${dir}" FILES ${files}) string(REGEX REPLACE "/" "\\\\" newDir ${dir})
source_group ("components\\${newDir}" FILES ${files})
endmacro (add_component_dir) endmacro (add_component_dir)
macro (add_component_qt_dir dir) macro (add_component_qt_dir dir)

14
components/CMakeLists.txt
View file

@ -151,29 +151,29 @@ add_component_dir (openmw-mp
Log Utils NetworkMessages Version Log Utils NetworkMessages Version
) )
add_component_dir (openmw-mp\\Base add_component_dir (openmw-mp/Base
BaseActor BaseEvent BasePacketProcessor BasePlayer BaseStructs BaseActor BaseEvent BasePacketProcessor BasePlayer BaseStructs
) )
add_component_dir (openmw-mp\\Controllers add_component_dir (openmw-mp/Controllers
PlayerPacketController ActorPacketController WorldPacketController PlayerPacketController ActorPacketController WorldPacketController
) )
add_component_dir(openmw-mp\\Master add_component_dir(openmw-mp/Master
MasterData PacketMasterQuery PacketMasterUpdate PacketMasterAnnounce BaseMasterPacket ProxyMasterPacket MasterData PacketMasterQuery PacketMasterUpdate PacketMasterAnnounce BaseMasterPacket ProxyMasterPacket
) )
add_component_dir (openmw-mp\\Packets add_component_dir (openmw-mp/Packets
BasePacket PacketPreInit BasePacket PacketPreInit
) )
add_component_dir (openmw-mp\\Packets\\Actor add_component_dir (openmw-mp/Packets/Actor
ActorPacket ActorPacket
PacketActorList PacketActorAuthority PacketActorTest PacketActorAnimPlay PacketActorAttack PacketActorCellChange PacketActorList PacketActorAuthority PacketActorTest PacketActorAnimPlay PacketActorAttack PacketActorCellChange
PacketActorAnimFlags PacketActorEquipment PacketActorPosition PacketActorSpeech PacketActorStatsDynamic PacketActorAnimFlags PacketActorEquipment PacketActorPosition PacketActorSpeech PacketActorStatsDynamic
) )
add_component_dir (openmw-mp\\Packets\\Player add_component_dir (openmw-mp/Packets/Player
PlayerPacket PlayerPacket
PacketHandshake PacketChatMessage PacketPlayerBaseInfo PacketPlayerCharGen PacketPlayerAnimFlags PacketPlayerAttack PacketHandshake PacketChatMessage PacketPlayerBaseInfo PacketPlayerCharGen PacketPlayerAnimFlags PacketPlayerAttack
PacketPlayerAttribute PacketPlayerBounty PacketPlayerCellChange PacketPlayerCellState PacketPlayerClass PacketPlayerAttribute PacketPlayerBounty PacketPlayerCellChange PacketPlayerCellState PacketPlayerClass
@ -182,7 +182,7 @@ add_component_dir (openmw-mp\\Packets\\Player
PacketPlayerTopic PacketPlayerActiveSkills PacketGUIBoxes PacketTime PacketPlayerTopic PacketPlayerActiveSkills PacketGUIBoxes PacketTime
) )
add_component_dir (openmw-mp\\Packets\\World add_component_dir (openmw-mp/Packets/World
WorldPacket WorldPacket
PacketContainer PacketObjectAnimPlay PacketObjectDelete PacketDoorState PacketObjectLock PacketObjectMove PacketObjectPlace PacketContainer PacketObjectAnimPlay PacketObjectDelete PacketDoorState PacketObjectLock PacketObjectMove PacketObjectPlace
PacketObjectRotate PacketObjectScale PacketObjectTrap PacketMusicPlay PacketVideoPlay PacketScriptLocalShort PacketObjectRotate PacketObjectScale PacketObjectTrap PacketMusicPlay PacketVideoPlay PacketScriptLocalShort