mirror of
https://github.com/pound-emu/pound.git
synced 2025-12-11 07:36:57 +00:00
Minor Changes
Signed-off-by: Xphalnos <yiga.steam@gmail.com>
This commit is contained in:
parent
ccedf3b251
commit
328292ce55
5 changed files with 12 additions and 15 deletions
4
.github/workflows/build.yml
vendored
4
.github/workflows/build.yml
vendored
|
|
@ -114,7 +114,7 @@ jobs:
|
|||
|
||||
- name: Install Dependencies
|
||||
run: |
|
||||
brew install ninja llvm
|
||||
brew install llvm
|
||||
|
||||
- name: Configure CMake (x86_64)
|
||||
run: >
|
||||
|
|
@ -156,7 +156,7 @@ jobs:
|
|||
|
||||
- name: Install Dependencies
|
||||
run: |
|
||||
brew install ninja llvm
|
||||
brew install llvm
|
||||
|
||||
- name: Configure CMake (ARM64)
|
||||
run: >
|
||||
|
|
|
|||
2
3rd_Party/SDL3
vendored
2
3rd_Party/SDL3
vendored
|
|
@ -1 +1 @@
|
|||
Subproject commit a96677bdf6b4acb84af4ec294e5f60a4e8cbbe03
|
||||
Subproject commit a8589a84226a6202831a3d49ff4edda4acab9acd
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
cmake_minimum_required(VERSION 3.22)
|
||||
cmake_minimum_required(VERSION 3.25)
|
||||
|
||||
#------------------------
|
||||
# ---- Project Setup ----
|
||||
|
|
@ -79,7 +79,7 @@ foreach(line ${submodule_lines})
|
|||
if(submodule_path STREQUAL "3rd_Party/imgui")
|
||||
verify_pinned_commit("imgui" "${submodule_path}" "${commit_hash}" "bf75bfec48fc00f532af8926130b70c0e26eb099")
|
||||
elseif(submodule_path STREQUAL "3rd_Party/SDL3")
|
||||
verify_pinned_commit("SDL3" "${submodule_path}" "${commit_hash}" "a96677bdf6b4acb84af4ec294e5f60a4e8cbbe03")
|
||||
verify_pinned_commit("SDL3" "${submodule_path}" "${commit_hash}" "a8589a84226a6202831a3d49ff4edda4acab9acd")
|
||||
endif()
|
||||
|
||||
message(STATUS "Verified submodule: ${submodule_path} (${commit_hash})")
|
||||
|
|
@ -107,10 +107,6 @@ add_subdirectory(src/targets/switch1/hardware)
|
|||
# ---- Target Configurations ----
|
||||
#--------------------------------
|
||||
|
||||
if(WIN32)
|
||||
add_compile_options(-DNOMINMAX -DWIN32_LEAN_AND_MEAN)
|
||||
endif()
|
||||
|
||||
include(TestBigEndian)
|
||||
TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
|
||||
|
||||
|
|
@ -133,6 +129,11 @@ foreach(TARGET ${POUND_PROJECT_TARGETS})
|
|||
-Wconversion>
|
||||
)
|
||||
|
||||
if(WIN32)
|
||||
target_compile_options(${TARGET} PRIVATE -DNOMINMAX -DWIN32_LEAN_AND_MEAN)
|
||||
target_compile_definitions(${TARGET} PRIVATE _CRT_SECURE_NO_WARNINGS) # Disable some Windows SDK deprecation warnings
|
||||
endif()
|
||||
|
||||
# Set Compile time log level for all targets.
|
||||
# 1: Trace
|
||||
# 2: Debug
|
||||
|
|
@ -145,10 +146,6 @@ endforeach()
|
|||
|
||||
# Optimizations
|
||||
set_property(TARGET Pound PROPERTY CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE TRUE)
|
||||
if (WIN32)
|
||||
target_compile_options(Pound PRIVATE $<$<CONFIG:Release>:/Oi>)
|
||||
target_compile_options(Pound PRIVATE $<$<CONFIG:Release>:/Ot>)
|
||||
endif()
|
||||
|
||||
target_link_libraries(Pound PRIVATE
|
||||
common
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef POUND_COMMON_ASSERT_H
|
||||
#define POUND_COMMON_ASSERT_H
|
||||
|
||||
__attribute__((noreturn)) void pound_internal_assert_fail(const char* file, int line, const char* func,
|
||||
[[noreturn]] void pound_internal_assert_fail(const char* file, int line, const char* func,
|
||||
const char* expr_str, const char* user_msg, ...);
|
||||
|
||||
#define PVM_ASSERT(expression) \
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ int main()
|
|||
|
||||
if (bool return_code = gui::init_imgui(&window); false == return_code)
|
||||
{
|
||||
LOG_ERROR( "Failed to initialize GUI");
|
||||
LOG_ERROR("Failed to initialize GUI");
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue