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

Merge branch '5_1-new' into tomcrypt-header

Browse Source
This commit is contained in:
quietly-turning
2020-06-25 21:53:21 -04:00
committed by GitHub
parent 43ecbf918b 135dc0ddab
commit 2b11f88b81
555 changed files with 110426 additions and 43527 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CMakeData-arch.cmake
+3 -5
View File
@@ -185,7 +185,7 @@ else()
list(APPEND SMDATA_ARCH_LOADING_HPP
"arch/LoadingWindow/LoadingWindow_MacOSX.h")
elseif(LINUX)
if(GTK2_FOUND)
if(GTK3_FOUND)
list(APPEND SMDATA_ARCH_LOADING_SRC
"arch/LoadingWindow/LoadingWindow_Gtk.cpp")
list(APPEND SMDATA_ARCH_LOADING_HPP
@@ -231,14 +231,12 @@ if(NOT APPLE)
"arch/Lights/LightsDriver_Linux_PIUIO.cpp"
"arch/Lights/LightsDriver_Linux_PIUIO_Leds.cpp"
"arch/Lights/LightsDriver_Linux_ITGIO.cpp"
"arch/Lights/LightsDriver_LinuxWeedTech.cpp"
"arch/Lights/LightsDriver_LinuxParallel.cpp")
"arch/Lights/LightsDriver_LinuxWeedTech.cpp")
list(APPEND SMDATA_ARCH_LIGHTS_HPP
"arch/Lights/LightsDriver_Linux_PIUIO.h"
"arch/Lights/LightsDriver_Linux_PIUIO_Leds.h"
"arch/Lights/LightsDriver_Linux_ITGIO.h"
"arch/Lights/LightsDriver_LinuxWeedTech.h"
"arch/Lights/LightsDriver_LinuxParallel.h")
"arch/Lights/LightsDriver_LinuxWeedTech.h")
if(WITH_PARALLEL_PORT)
list(APPEND SMDATA_ARCH_LIGHTS_SRC
"arch/Lights/LightsDriver_LinuxParallel.cpp")
src/CMakeData-gtk.cmake
+3 -3
View File
@@ -1,4 +1,4 @@
if(NOT GTK2_FOUND)
if(NOT GTK3_FOUND)
return()
endif()
@@ -28,13 +28,13 @@ set_target_properties("GtkModule"
set_target_properties("GtkModule"
PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO
"${SM_ROOT_DIR}")
target_link_libraries("GtkModule" ${GTK2_LIBRARIES})
target_link_libraries("GtkModule" ${GTK3_LIBRARIES})
set_property(TARGET "GtkModule" PROPERTY FOLDER "Internal Libraries")
list(APPEND SM_GTK_INCLUDE_DIRS
"${SM_SRC_DIR}"
"${SM_SRC_DIR}/generated"
"${SM_SRC_DIR}/arch/LoadingWindow"
"${GTK2_INCLUDE_DIRS}")
"${GTK3_INCLUDE_DIRS}")
sm_add_compile_definition("GtkModule" CMAKE_POWERED)
src/CMakeLists.txt
+26 -12
View File
@@ -142,8 +142,12 @@ if(WITH_SSE2)
if(SM_WIN32_ARCH MATCHES "x86")
set(SM_COMPILE_FLAGS "${SM_COMPILE_FLAGS} /arch:SSE2")
endif()
else()
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "x86")
set(SM_COMPILE_FLAGS "${SM_COMPILE_FLAGS} -msse2")
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")
set(SM_COMPILE_FLAGS "${SM_COMPILE_FLAGS} -mtune=cortex-a72")
else()
message("Unrecognized host processor type")
endif()
endif()
@@ -332,9 +336,14 @@ else() # Linux
sm_add_compile_definition("${SM_EXE_NAME}" CRASH_HANDLER)
if(LINUX)
# used only in the ArchHooks_Unix.cpp file
sm_add_compile_definition("${SM_EXE_NAME}" BACKTRACE_METHOD_X86_LINUX)
sm_add_compile_definition("${SM_EXE_NAME}"
if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86" OR CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
sm_add_compile_definition("${SM_EXE_NAME}" BACKTRACE_METHOD_X86_LINUX)
sm_add_compile_definition("${SM_EXE_NAME}"
BACKTRACE_METHOD_TEXT="x86 custom backtrace")
else()
sm_add_compile_definition("${SM_EXE_NAME}"
BACKTRACE_METHOD_TEXT="no backtrace")
endif()
sm_add_compile_definition(
"${SM_EXE_NAME}" BACKTRACE_LOOKUP_METHOD_TEXT="backtrace_symbols")
if(${DL_FOUND})
@@ -351,12 +360,15 @@ else() # Linux
message("Host processor is ${CMAKE_SYSTEM_PROCESSOR}")
if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
message("Host processor is 64bit")
message("Host processor is 64bit X86")
sm_add_compile_definition("${SM_EXE_NAME}" CPU_X86_64)
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "x86"
OR CMAKE_SYSTEM_PROCESSOR MATCHES "i686")
message("Host processor is 32bit")
message("Host processor is 32bit X86")
sm_add_compile_definition("${SM_EXE_NAME}" CPU_X86)
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")
message("Host processor is 64bit ARM")
sm_add_compile_definition("${SM_EXE_NAME}" CPU_AARCH64)
else()
message("Unrecognized host processor type")
endif()
@@ -378,7 +390,7 @@ else() # Linux
sm_add_compile_definition("${SM_EXE_NAME}" BSD)
endif()
if(GTK2_FOUND)
if(GTK3_FOUND)
sm_add_compile_definition("${SM_EXE_NAME}" HAVE_GTK)
endif()
@@ -559,8 +571,8 @@ else() # Unix / Linux TODO: Remember to find and locate the zip archive files.
list(APPEND SMDATA_LINK_LIB "${OPENGL_LIBRARY}")
if(GTK2_FOUND)
list(APPEND SMDATA_LINK_LIB "${GTK2_LIBRARIES}")
if(GTK3_FOUND)
list(APPEND SMDATA_LINK_LIB "${GTK3_LIBRARIES}")
endif()
list(APPEND SMDATA_LINK_LIB "${BZIP2_LIBRARIES}" "${CMAKE_THREAD_LIBS_INIT}")
@@ -649,8 +661,8 @@ if(NOT APPLE)
list(APPEND SM_INCLUDE_DIRS "${SM_FFMPEG_SRC_DIR}" "${SM_FFMPEG_ROOT}")
endif()
endif()
if(HAS_GTK2)
list(APPEND SM_INCLUDE_DIRS "${GTK2_INCLUDE_DIRS}")
if(HAS_GTK3)
list(APPEND SM_INCLUDE_DIRS "${GTK3_INCLUDE_DIRS}")
endif()
if(X11_FOUND)
list(APPEND SM_INCLUDE_DIRS "${X11_INCLUDE_DIR}")
@@ -677,8 +689,10 @@ endif()
if(WIN32)
# FIXME: This makes no sense...
#list(APPEND SM_INCLUDE_DIRS ${DIRECTX_INCLUDE_DIR})
elseif(NOT WITH_SYSTEM_PNG)
list(APPEND SM_INCLUDE_DIRS "${SM_EXTERN_DIR}/libpng/include")
endif()
if(NOT WITH_SYSTEM_PNG)
list(APPEND SM_INCLUDE_DIRS "${SM_EXTERN_DIR}/libpng")
endif()
if(NOT WITH_SYSTEM_TOMCRYPT)
src/CMakeProject-texture.cmake
+1 -1
View File
@@ -59,7 +59,7 @@ endif()
if(NOT WITH_SYSTEM_PNG)
list(APPEND TEXTURE_INCLUDE_DIRS
"${SM_EXTERN_DIR}/libpng/include")
"${SM_EXTERN_DIR}/libpng")
endif()
target_include_directories("TextureFontGenerator"
src/Makefile.am
+11 -11
View File
@@ -48,17 +48,17 @@ ver.cpp:
fi
PNG = \
../extern/libpng/include/png.c ../extern/libpng/include/.png.h \
../extern/libpng/include/pngconf.h ../extern/libpng/include/pngdebug.h \
../extern/libpng/include/pngerror.c ../extern/libpng/include/pngget.c \
../extern/libpng/include/pnginfo.h ../extern/libpng/include/scripts/pnglibconf.h \
../extern/libpng/include/pngmem.c ../extern/libpng/include/pngpread.c \
../extern/libpng/include/pngpriv.h ../extern/libpng/include/pngread.c \
../extern/libpng/include/pngrio.c ../extern/libpng/include/pngrtran.c \
../extern/libpng/include/pngrutil.c ../extern/libpng/include/pngset.c \
../extern/libpng/include/pngstruct.h ../extern/libpng/include/pngtrans.c \
../extern/libpng/include/pngwio.c ../extern/libpng/include/pngwrite.c \
../extern/libpng/include/pngwtran.c ../extern/libpng/include/pngwutil.c
../extern/libpng/png.c ../extern/libpng/.png.h \
../extern/libpng/pngconf.h ../extern/libpng/pngdebug.h \
../extern/libpng/pngerror.c ../extern/libpng/pngget.c \
../extern/libpng/pnginfo.h ../extern/libpng/scripts/pnglibconf.h \
../extern/libpng/pngmem.c ../extern/libpng/pngpread.c \
../extern/libpng/pngpriv.h ../extern/libpng/pngread.c \
../extern/libpng/pngrio.c ../extern/libpng/pngrtran.c \
../extern/libpng/pngrutil.c ../extern/libpng/pngset.c \
../extern/libpng/pngstruct.h ../extern/libpng/pngtrans.c \
../extern/libpng/pngwio.c ../extern/libpng/pngwrite.c \
../extern/libpng/pngwtran.c ../extern/libpng/pngwutil.c
Screens = \
Screen.cpp Screen.h ScreenAttract.cpp ScreenAttract.h \
src/RageSurface_Load_PNG.cpp
+3 -7
View File
@@ -1,4 +1,7 @@
#include "global.h"
#include <png.h>
#include "RageSurface_Load_PNG.h"
#include "RageUtil.h"
#include "RageLog.h"
@@ -6,17 +9,10 @@
#include "RageSurface.h"
#if defined(_MSC_VER)
#include "../extern/libpng/include/png.h"
#if defined(_BINARY_PNG)
#pragma comment(lib, "libpng.lib")
#endif
#pragma warning(disable: 4611) /* interaction between '_setjmp' and C++ object destruction is non-portable */
#else
#ifndef SYSTEM_PNG
#include "../extern/libpng/include/png.h"
#else
#include <png.h>
#endif // SYSTEM_PNG
#endif // _MSC_VER
namespace
src/RageSurface_Save_PNG.cpp
+3 -7
View File
@@ -1,4 +1,7 @@
#include "global.h"
#include <png.h>
#include "RageSurface_Save_PNG.h"
#include "RageSurface.h"
#include "RageSurfaceUtils.h"
@@ -7,17 +10,10 @@
#include "RageUtil.h"
#if defined(_MSC_VER)
#include "../extern/libpng/include/png.h"
#if defined(_BINARY_PNG)
#pragma comment(lib, "libpng.lib")
#endif
#pragma warning(disable: 4611) /* interaction between '_setjmp' and C++ object destruction is non-portable */
#else
#ifndef SYSTEM_PNG
#include "../extern/libpng/include/png.h"
#else
#include <png.h>
#endif
#endif // _MSC_VER
static void SafePngError( png_struct *pPng, const RString &sStr )
src/arch/LoadingWindow/LoadingWindow_GtkModule.cpp
+4 -2
View File
@@ -31,7 +31,9 @@ extern "C" const char *Init( int *argc, char ***argv )
//gtk_window_set_icon( GTK_WINDOW(window), );
gtk_widget_realize(window);
splash = gtk_image_new_from_file(splash_image_path);
splash = gtk_image_new_from_pixbuf(
gdk_pixbuf_new_from_file (splash_image_path, nullptr)
);
label = gtk_label_new(nullptr);
gtk_label_set_justify(GTK_LABEL(label),GTK_JUSTIFY_CENTER);
@@ -41,7 +43,7 @@ extern "C" const char *Init( int *argc, char ***argv )
progressBar = gtk_progress_bar_new();
gtk_progress_bar_set_fraction( GTK_PROGRESS_BAR(progressBar), 0.0 );
vbox = gtk_vbox_new(FALSE,0);
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add(GTK_CONTAINER(window),vbox);
gtk_box_pack_start(GTK_BOX(vbox),splash,FALSE,FALSE,0);
gtk_box_pack_end(GTK_BOX(vbox),progressBar,FALSE,FALSE,0);
src/archutils/Common/PthreadHelpers.cpp
+3
View File
@@ -244,6 +244,9 @@ bool GetThreadBacktraceContext( uint64_t ThreadID, BacktraceContext *ctx )
ctx->PC = (void *)ptrace( PTRACE_PEEKUSER, pid_t(ThreadID), (void *)(PT_NIP<<2), 0 );
if( errno )
return false;
#elif defined(CPU_AARCH64)
// NYI
return false;
#else
#error GetThreadBacktraceContext: which arch?
#endif
src/archutils/Unix/Backtrace.cpp
+11
View File
@@ -398,6 +398,12 @@ void GetSignalBacktraceContext( BacktraceContext *ctx, const ucontext_t *uc )
ctx->sp = (void *) uc->uc_mcontext.gregs[REG_RSP];
ctx->pid = GetCurrentThreadId();
}
#elif defined(CPU_AARCH64)
void GetSignalBacktraceContext( BacktraceContext *ctx, const ucontext_t *uc )
{
// NYI
}
#else
#error
#endif
@@ -740,6 +746,11 @@ void GetBacktrace( const void **buf, size_t size, const BacktraceContext *ctx )
#warning Undefined BACKTRACE_METHOD_*
void InitializeBacktrace() { }
void GetSignalBacktraceContext( BacktraceContext *ctx, const ucontext_t *uc )
{
// NYI
}
void GetBacktrace( const void **buf, size_t size, const BacktraceContext *ctx )
{
buf[0] = BACKTRACE_METHOD_NOT_AVAILABLE;