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

Clean up build system

Browse Source
This commit is contained in:
Martin Natano
2022-05-29 20:48:16 +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
.gitignore
+12 -51
View File
@@ -11,19 +11,12 @@ cmake_install.cmake
CPackConfig.cmake
CPackSourceConfig.cmake
# The following are generated from CMake, and thus should be stopped.
.codelite/
ITGmania.project
ITGmania.workspace
version.hpp
Build/*
Build/*/*
Debug/
Release/
Contents/
Build/
!Build/INSTALL.md
!Build/README.md
verdata.*
ITGmania-debug
itgmania-debug
src/version_updater/VersionUpdater
src/generated
extern/mad-0.15.1b/config.h
extern/libjpeg/jconfig.h
@@ -35,21 +28,14 @@ ___*
*.sublime-project
*.sublime-workspace
*.old
.codelite/
.vscode/
# Repository Files
*.orig
.git
.hg
.hgignore
.hgtags
.svn
.cvsignore
# Patch Files
*.diff
*.orig
*.patch
*_BACKUP_*
*_BASE_*
*_LOCAL_*
*_REMOTE_*
*.rej
# Mac General Files
*.app
@@ -72,28 +58,16 @@ Thumbs.db
*.exe
*.dll
!extern/ffmpeg-w32/*/*.dll
nsis_strings_temp.inc
# Linux General Files
.dirstamp
itgmania
config.status
_build/*
aclocal.m4
autoconf/*
autom4te.cache/*
ITGmania
core
# Version control specific.
*.BACKUP.*
*.BASE.*
*.LOCAL.*
*.REMOTE.*
itgmania-debug
itgmania-min-size
itgmania-release-symbols
*.core
# StepMania Specific
*.smzip
ver.cpp
gitversion.h
Cache/
Save/
@@ -106,16 +80,6 @@ Data/UserPrefs
Data/uPrefs
Data/GamePrefs/*.cfg
Data/Static.ini
src/version.bin
src/verstub.cpp
src/build-*
src/Release-*
src/libtomcrypt/build-*
src/libtomcrypt/Release-*
src/libtomcrypt/Debug
src/libtommath/build-*
src/libtommath/Release-*
src/libtommath/Debug
src/*.so
Data/SpeedMods.txt
crashinfo.txt
@@ -124,8 +88,6 @@ Program/ITGmania*.lib
# Unknown File Types
*.dia
.deps
*.rej
tests/*.err
*.ncb
*.tlog
@@ -143,4 +105,3 @@ BuildLog.htm
*.swp
*.pc
*.d
.vscode/
CMake/SMDefs.cmake
-6
View File
@@ -17,19 +17,13 @@ if(NOT (ret STREQUAL "0"))
"git was not found on your path. If you collect bug reports, please add git to your path and rerun cmake."
)
set(SM_VERSION_GIT_HASH "UNKNOWN")
set(SM_VERSION_FULL
"${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}.${SM_VERSION_PATCH}-${SM_VERSION_GIT_HASH}")
set(SM_VERSION_GIT
"${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}.${SM_VERSION_PATCH}-${SM_VERSION_GIT_HASH}")
else()
if(WITH_FULL_RELEASE)
set(SM_VERSION_FULL
"${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}.${SM_VERSION_PATCH}")
set(SM_VERSION_GIT
"${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}.${SM_VERSION_PATCH}")
else()
set(SM_VERSION_FULL
"${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}.${SM_VERSION_PATCH}-git-${SM_VERSION_GIT_HASH}")
set(SM_VERSION_GIT
"${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}.${SM_VERSION_PATCH}-git-${SM_VERSION_GIT_HASH}")
endif()
extern/CMakeProject-json.cmake
Vendored
+3 -4
View File
@@ -2,11 +2,10 @@ if(WITH_SYSTEM_JSONCPP)
find_package(PkgConfig REQUIRED)
pkg_check_modules(JSONCPP REQUIRED jsoncpp)
else()
list(APPEND JSON_SRC "jsoncpp/jsoncpp.cpp")
set(JSON_SRC "jsoncpp/jsoncpp.cpp")
list(APPEND JSON_HPP
"jsoncpp/json/json-forwards.h"
"jsoncpp/json/json.h")
set(JSON_HPP "jsoncpp/json/json-forwards.h"
"jsoncpp/json/json.h")
source_group("" FILES ${JSON_SRC} ${JSON_HPP})
extern/CMakeProject-miniz.cmake
Vendored
+3 -3
View File
@@ -1,9 +1,9 @@
list(APPEND MINIZ_SRC "miniz/miniz.c")
list(APPEND MINIZ_HPP "miniz/miniz.h")
set(MINIZ_SRC "miniz/miniz.c")
set(MINIZ_HPP "miniz/miniz.h")
source_group("" FILES ${MINIZ_SRC} ${MINIZ_HPP})
add_library("miniz" ${MINIZ_SRC} ${MINIZ_HPP})
add_library("miniz" STATIC ${MINIZ_SRC} ${MINIZ_HPP})
set_property(TARGET "miniz" PROPERTY FOLDER "External Libraries")
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)