AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update submodules, fix Linux build

This commit is contained in:
Phillip Stephens 2018-02-27 17:46:14 -08:00
parent c15c5f47ed
commit 0c95ee6665
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Editor/CMakeLists.txt
View File

@ -16,6 +16,8 @@ else()
set(METADATA_VERSION_STRING "BETA") set(METADATA_VERSION_STRING "BETA")
endif() endif()
unset(URDE_PLAT_LIBS)
if(WIN32) if(WIN32)
configure_file(platforms/win/urde.rc.in "${CMAKE_CURRENT_SOURCE_DIR}/platforms/win/urde.rc" @ONLY) configure_file(platforms/win/urde.rc.in "${CMAKE_CURRENT_SOURCE_DIR}/platforms/win/urde.rc" @ONLY)
set(PLAT_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/platforms/win/urde.rc" platforms/win/urde.manifest) set(PLAT_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/platforms/win/urde.rc" platforms/win/urde.manifest)
@ -75,6 +77,7 @@ elseif(UNIX)
add_subdirectory(platforms/freedesktop) add_subdirectory(platforms/freedesktop)
declare_wmicon_target() declare_wmicon_target()
set(PLAT_SRCS mainicon_netwm.cpp) set(PLAT_SRCS mainicon_netwm.cpp)
set(URDE_PLAT_LIBS rt)
endif() endif()
add_executable(urde WIN32 MACOSX_BUNDLE add_executable(urde WIN32 MACOSX_BUNDLE
@ -103,7 +106,7 @@ target_link_libraries(urde
athena-core nod logvisor athena-libyaml amuse boo athena-core nod logvisor athena-libyaml amuse boo
${PNG_LIB} libjpeg-turbo squish xxhash zeus ${PNG_LIB} libjpeg-turbo squish xxhash zeus
kabufuda jbus discord-rpc ${ZLIB_LIBRARIES} ${LZO_LIB} kabufuda jbus discord-rpc ${ZLIB_LIBRARIES} ${LZO_LIB}
${BOO_SYS_LIBS}) ${BOO_SYS_LIBS} ${URDE_PLAT_LIBS})
if(COMMAND add_sanitizers) if(COMMAND add_sanitizers)
add_sanitizers(urde) add_sanitizers(urde)
endif() endif()

6
Runtime/World/CScriptStreamedMusic.cpp
View File

@ -50,7 +50,11 @@ CScriptStreamedMusic::CScriptStreamedMusic(TUniqueId id, const CEntityInfo& info
float fadeIn, float fadeOut, u32 volume, bool loop, bool music) float fadeIn, float fadeOut, u32 volume, bool loop, bool music)
: CEntity(id, info, active, name), x34_fileName(fileName), x44_noStopOnDeactivate(noStopOnDeactivate), : CEntity(id, info, active, name), x34_fileName(fileName), x44_noStopOnDeactivate(noStopOnDeactivate),
x45_fileIsDsp(IsDSPFile(fileName)), x46_loop(loop), x47_music(music), x45_fileIsDsp(IsDSPFile(fileName)), x46_loop(loop), x47_music(music),
x48_fadeIn(fadeIn), x4c_fadeOut(fadeOut), x50_volume(volume) {} x48_fadeIn(fadeIn), x4c_fadeOut(fadeOut), x50_volume(volume)
{
while (x34_fileName.find("/audio") != std::string::npos)
x34_fileName.replace(x34_fileName.find("/audio"), std::strlen("/audio"), "/Audio");
}
void CScriptStreamedMusic::Stop(CStateManager& mgr) void CScriptStreamedMusic::Stop(CStateManager& mgr)
{ {

2
hecl

@ -1 +1 @@
Subproject commit 34ceebef0cc7a8d2ada422704ff265187a4fd345 Subproject commit fabd0ee3caa9d8362d23ffac418556fbb949efba