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

Try different way of specifying link ordering

This commit is contained in:
Luke Street 2021-05-27 15:10:21 -04:00
parent ef536c66f9
commit 3524ac2281
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
DataSpec/AssetNameMapNull.cpp
View File

@ -1,11 +1,9 @@
#include <cstddef> #include <cstddef>
#include <cstdint> #include <cstdint>
extern "C" { extern "C" const uint8_t ASSET_NAME_MP32[] = {0};
const uint8_t ASSET_NAME_MP32[] = {0}; extern "C" const size_t ASSET_NAME_MP32_SZ = 0;
const size_t ASSET_NAME_MP32_SZ = 0; extern "C" const size_t ASSET_NAME_MP32_DECOMPRESSED_SZ = 0;
const size_t ASSET_NAME_MP32_DECOMPRESSED_SZ = 0; extern "C" const uint8_t ASSET_NAME_MP64[] = {0};
const uint8_t ASSET_NAME_MP64[] = {0}; extern "C" const size_t ASSET_NAME_MP64_SZ = 0;
const size_t ASSET_NAME_MP64_SZ = 0; extern "C" const size_t ASSET_NAME_MP64_DECOMPRESSED_SZ = 0;
const size_t ASSET_NAME_MP64_DECOMPRESSED_SZ = 0;
}

7
Runtime/CMakeLists.txt
View File

@ -136,14 +136,15 @@ endif()
endfunction() endfunction()
set(RUNTIME_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) set(RUNTIME_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
set(RUNTIME_LIBRARIES ${HECL_APPLICATION_REPS_TARGETS_LIST} RetroDataSpec AssetNameMapNull NESEmulator set(RUNTIME_LIBRARIES ${HECL_APPLICATION_REPS_TARGETS_LIST} RetroDataSpec NESEmulator
libjpeg-turbo jbus kabufuda discord-rpc logvisor OptickCore imgui) libjpeg-turbo jbus kabufuda discord-rpc logvisor OptickCore imgui)
add_runtime_common_library(RuntimeCommon ${RUNTIME_SOURCES_A}) add_runtime_common_library(RuntimeCommon ${RUNTIME_SOURCES_A})
target_include_directories(RuntimeCommon PUBLIC ${RUNTIME_INCLUDES}) target_include_directories(RuntimeCommon PUBLIC ${RUNTIME_INCLUDES})
target_link_libraries(RuntimeCommon PUBLIC ${RUNTIME_LIBRARIES})
add_runtime_common_library(RuntimeCommonB ${RUNTIME_SOURCES_B}) add_runtime_common_library(RuntimeCommonB ${RUNTIME_SOURCES_B})
target_include_directories(RuntimeCommonB PUBLIC ${RUNTIME_INCLUDES})
target_link_libraries(RuntimeCommonB PUBLIC ${RUNTIME_LIBRARIES}) target_link_libraries(RuntimeCommonB PUBLIC ${RUNTIME_LIBRARIES})
target_link_libraries(RuntimeCommon PUBLIC RuntimeCommonB)
if(WIN32) if(WIN32)
configure_file(platforms/win/metaforce.rc.in "${CMAKE_CURRENT_SOURCE_DIR}/platforms/win/metaforce.rc" @ONLY) configure_file(platforms/win/metaforce.rc.in "${CMAKE_CURRENT_SOURCE_DIR}/platforms/win/metaforce.rc" @ONLY)
@ -205,7 +206,7 @@ elseif(UNIX)
endif() endif()
add_executable(metaforce CMain.cpp ${PLAT_SRCS} ImGuiConsole.hpp ImGuiConsole.cpp ImGuiEntitySupport.hpp ImGuiEntitySupport.cpp) add_executable(metaforce CMain.cpp ${PLAT_SRCS} ImGuiConsole.hpp ImGuiConsole.cpp ImGuiEntitySupport.hpp ImGuiEntitySupport.cpp)
target_link_libraries(metaforce PUBLIC RuntimeCommon ${PLAT_LIBS}) target_link_libraries(metaforce PUBLIC RuntimeCommon RuntimeCommonB AssetNameMapNull ${PLAT_LIBS})
if(COMMAND add_sanitizers) if(COMMAND add_sanitizers)
add_sanitizers(metaforce) add_sanitizers(metaforce)