actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Clean up build system

Browse Source
This commit is contained in:
Martin Natano
2022-05-30 23:57:33 +02:00
parent 7d29ee308d
commit 2bb9124c72
6 changed files with 25 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CMakeLists.txt
-12
View File
@@ -61,7 +61,6 @@ else()
set(SM_NAME_RELWITHDEBINFO "itgmania-release-symbols")
endif()
# TODO: Make this actually be data and not an executable.
if(APPLE)
add_executable("${SM_EXE_NAME}"
MACOSX_BUNDLE
@@ -522,12 +521,6 @@ else() # Unix / Linux TODO: Remember to find and locate the zip archive files.
if(HAS_PULSE)
list(APPEND SMDATA_LINK_LIB ${PULSEAUDIO_LIBRARY})
# PACKAGE_NAME and PACKAGE_VERSION are only used in this scenario. Why is
# not clear. TODO: Remove this silliness.
target_compile_definitions("${SM_EXE_NAME}" PRIVATE PACKAGE_NAME="ITGmania")
set(PACKAGE_VERSION "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}")
target_compile_definitions("${SM_EXE_NAME}" PRIVATE
PACKAGE_VERSION="${PACKAGE_VERSION}")
endif()
if(X11_FOUND)
@@ -591,11 +584,6 @@ else()
endif()
endif()
if(WIN32)
# FIXME: This makes no sense...
#list(APPEND SM_INCLUDE_DIRS ${DIRECTX_INCLUDE_DIR})
endif()
if(NOT WITH_SYSTEM_TOMCRYPT)
list(APPEND SM_INCLUDE_DIRS "${SM_SRC_DIR}/libtomcrypt/src/headers")
endif()
src/arch/Sound/RageSoundDriver_PulseAudio.cpp
+7 -5
View File
@@ -1,4 +1,5 @@
#include "global.h"
#include "ProductInfo.h"
#include "RageSoundDriver_PulseAudio.h"
#include "RageLog.h"
#include "RageSound.h"
@@ -6,6 +7,7 @@
#include "RageUtil.h"
#include "RageTimer.h"
#include "PrefsManager.h"
#include "ver.h"
#include <pulse/error.h>
#include <sys/time.h>
#include <sys/resource.h>
@@ -52,15 +54,15 @@ RString RageSoundDriver_PulseAudio::Init()
#ifdef PA_PROP_APPLICATION_NAME /* proplist available only since 0.9.11 */
pa_proplist *plist = pa_proplist_new();
pa_proplist_sets(plist, PA_PROP_APPLICATION_NAME, PACKAGE_NAME);
pa_proplist_sets(plist, PA_PROP_APPLICATION_VERSION, PACKAGE_VERSION);
pa_proplist_sets(plist, PA_PROP_APPLICATION_NAME, PRODUCT_FAMILY);
pa_proplist_sets(plist, PA_PROP_APPLICATION_VERSION, product_version);
pa_proplist_sets(plist, PA_PROP_MEDIA_ROLE, "game");
LOG->Trace("Pulse: pa_context_new_with_proplist()...");
m_PulseCtx = pa_context_new_with_proplist(
pa_threaded_mainloop_get_api(m_PulseMainLoop),
"StepMania", plist);
PRODUCT_FAMILY, plist);
pa_proplist_free(plist);
if(m_PulseCtx == nullptr)
@@ -71,7 +73,7 @@ RString RageSoundDriver_PulseAudio::Init()
LOG->Trace("Pulse: pa_context_new()...");
m_PulseCtx = pa_context_new(
pa_threaded_mainloop_get_api(m_PulseMainLoop),
"Stepmania");
PRODUCT_FAMILY);
if(m_PulseCtx == nullptr)
{
return "pa_context_new() failed!";
@@ -150,7 +152,7 @@ void RageSoundDriver_PulseAudio::m_InitStream(void)
/* create the stream */
LOG->Trace("Pulse: pa_stream_new()...");
m_PulseStream = pa_stream_new(m_PulseCtx, "Stepmania Audio", &ss, &map);
m_PulseStream = pa_stream_new(m_PulseCtx, PRODUCT_FAMILY " Audio", &ss, &map);
if(m_PulseStream == nullptr)
{
if(asprintf(&m_Error, "pa_stream_new(): %s", pa_strerror(pa_context_errno(m_PulseCtx))) == -1)