Move all submodules to extern

This commit is contained in:
Luke Street 2021-04-06 15:02:50 -04:00
parent 3c2dd5b95a
commit e9008c9e25
62 changed files with 88 additions and 69 deletions

30
.gitmodules vendored
View File

@ -1,21 +1,21 @@
[submodule "nod"]
path = nod
path = extern/nod
url = ../nod.git
branch = master
[submodule "amuse"]
path = amuse
path = extern/amuse
url = ../amuse.git
branch = master
[submodule "kabufuda"]
path = kabufuda
path = extern/kabufuda
url = ../kabufuda.git
branch = master
[submodule "jbus"]
path = jbus
path = extern/jbus
url = ../jbus.git
branch = master
[submodule "assetnameparser/tinyxml2"]
path = assetnameparser/tinyxml2
path = extern/tinyxml2
url = ../tinyxml2.git
branch = master
[submodule "hecl-gui"]
@ -23,42 +23,42 @@
url = ../hecl-gui.git
branch = master
[submodule "sanitizers-cmake"]
path = sanitizers-cmake
path = extern/sanitizers-cmake
url = https://github.com/arsenm/sanitizers-cmake.git
branch = master
[submodule "discord-rpc"]
path = discord-rpc
path = extern/discord-rpc
url = https://github.com/discordapp/discord-rpc.git
branch = master
[submodule "rapidjson"]
path = rapidjson
path = extern/rapidjson
url = https://github.com/Tencent/rapidjson.git
branch = master
[submodule "NESEmulator/fixNES"]
path = NESEmulator/fixNES
path = extern/fixNES
url = https://github.com/FIX94/fixNES.git
branch = master
[submodule "extern/libSquish"]
path = hecl/extern/libSquish
path = extern/libSquish
url = ../libSquish.git
branch = master
[submodule "extern/athena"]
path = hecl/extern/athena
path = extern/athena
url = ../../libAthena/athena.git
branch = master
[submodule "extern/boo"]
path = hecl/extern/boo
path = extern/boo
url = ../boo.git
branch = master
[submodule "extern/libjpeg-turbo"]
path = hecl/extern/libjpeg-turbo
path = extern/libjpeg-turbo
url = ../libjpeg-turbo.git
branch = thp
[submodule "freetype2"]
path = specter/freetype2
path = extern/freetype2
url = ../freetype2
branch = master
[submodule "zeus"]
path = zeus
path = extern/zeus
url = ../zeus.git
branch = master

View File

@ -103,7 +103,7 @@ endif()
set(BUILD_SHARED_LIBS OFF CACHE BOOL "Force shared libs off" FORCE)
set(BUILD_STATIC_LIBS ON CACHE BOOL "Force static libs on" FORCE)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/sanitizers-cmake/cmake")
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/extern/sanitizers-cmake/cmake")
find_package(Sanitizers)
if (CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL AMD64)
@ -331,15 +331,15 @@ endif()
# Add discord-rpc here
if(NOT GEKKO AND NOT NX)
set(PROJECT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/discord-rpc)
set(PROJECT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/extern/discord-rpc)
if (NOT CMAKE_INSTALL_LIBDIR)
set(CMAKE_INSTALL_LIBDIR ${CMAKE_BINARY_DIR}/fake-prefix)
endif()
add_subdirectory(discord-rpc/src)
target_include_directories(discord-rpc PRIVATE rapidjson/include PUBLIC discord-rpc/include)
add_subdirectory(extern/discord-rpc/src)
target_include_directories(discord-rpc PRIVATE extern/rapidjson/include PUBLIC extern/discord-rpc/include)
endif()
add_subdirectory(nod)
add_subdirectory(extern/nod)
set(DATA_SPEC_LIBS RetroDataSpec AssetNameMap)
set(HECL_DATASPEC_DECLS
@ -369,12 +369,17 @@ set(HECL_DATASPEC_PUSHES
hecl::Database::DATA_SPEC_REGISTRY.push_back(&DataSpec::SpecEntMP3PC);
hecl::Database::DATA_SPEC_REGISTRY.push_back(&DataSpec::SpecEntMP3ORIG);")
add_subdirectory(extern/athena)
add_subdirectory(extern/boo)
add_subdirectory(hecl/shaderc)
include(hecl/ApplicationTools.cmake)
add_subdirectory(specter/shaders)
add_subdirectory(Shaders)
add_subdirectory(extern/libSquish)
add_subdirectory(extern/libpng)
add_subdirectory(extern/libjpeg-turbo)
add_subdirectory(hecl)
add_subdirectory(zeus)
add_subdirectory(extern/zeus)
target_include_directories(hecl-full PRIVATE ${CMAKE_SOURCE_DIR})
target_include_directories(hecl-light PRIVATE ${CMAKE_SOURCE_DIR})
target_link_libraries(hecl-full PRIVATE zeus nod)
@ -409,18 +414,22 @@ if(NOT TARGET atdna)
endif()
endif()
add_subdirectory(amuse)
add_subdirectory(extern/amuse)
add_subdirectory(extern/freetype2)
if (NOT MSVC)
target_compile_options(freetype PRIVATE -Wno-implicit-fallthrough)
endif()
add_subdirectory(specter)
target_include_directories(specter PRIVATE ${CMAKE_SOURCE_DIR})
target_link_libraries(specter PRIVATE nod)
add_subdirectory(assetnameparser)
add_compile_definitions(URDE_ZIP_INPUT_STREAM=1) # Enable CZipInputStream now that zlib header is known
add_subdirectory(DataSpec)
add_subdirectory(kabufuda)
add_subdirectory(extern/kabufuda)
add_subdirectory(Editor)
add_subdirectory(jbus)
set(JBUS_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/jbus/include)
add_subdirectory(extern/jbus)
set(JBUS_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/extern/jbus/include)
set(CLIENT_SOURCES
${CMAKE_SOURCE_DIR}/Editor/ProjectResourceFactoryBase.hpp

View File

@ -1,13 +1,17 @@
file(GLOB MAPPER_SRCS fixNES/mapper/*.c)
file(GLOB MAPPER_SRCS ../extern/fixNES/mapper/*.c)
add_library(NESEmulator CNESEmulator.hpp CNESEmulator.cpp CNESShader.hpp CNESShader.cpp malloc.h
apu.c fixNES/audio_fds.c fixNES/audio_mmc5.c fixNES/audio_vrc6.c fixNES/audio_vrc7.c
fixNES/audio_n163.c fixNES/audio_s5b.c fixNES/cpu.c ppu.c fixNES/mem.c fixNES/input.c
fixNES/mapper.c fixNES/mapperList.c fixNES/fm2play.c fixNES/vrc_irq.c ${MAPPER_SRCS})
target_include_directories(NESEmulator PRIVATE ${CMAKE_SOURCE_DIR}/DataSpec ${CMAKE_SOURCE_DIR}/Runtime
apu.c ../extern/fixNES/audio_fds.c ../extern/fixNES/audio_mmc5.c ../extern/fixNES/audio_vrc6.c
../extern/fixNES/audio_vrc7.c ../extern/fixNES/audio_n163.c ../extern/fixNES/audio_s5b.c
../extern/fixNES/cpu.c ppu.c ../extern/fixNES/mem.c ../extern/fixNES/input.c ../extern/fixNES/mapper.c
../extern/fixNES/mapperList.c ../extern/fixNES/fm2play.c ../extern/fixNES/vrc_irq.c ${MAPPER_SRCS})
target_include_directories(NESEmulator PRIVATE
${CMAKE_SOURCE_DIR}/DataSpec
${CMAKE_SOURCE_DIR}/Runtime
${CMAKE_SOURCE_DIR}/extern
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_compile_definitions(NESEmulator PRIVATE COL_32BIT=1 COL_TEX_BSWAP=1)
target_link_libraries(NESEmulator boo hecl-full RuntimeCommon ${HECL_APPLICATION_REPS_TARGETS_LIST})
if (NOT MSVC)
target_compile_options(NESEmulator PRIVATE -Wno-implicit-fallthrough -Wno-format -Wno-pointer-compare
-Wno-memset-elt-size)
endif()
endif ()

View File

@ -1,46 +1,65 @@
include_directories(../hecl/include
../hecl/extern/boo/include
../hecl/extern/athena/include
../specter/zeus/include
../nod/include
../nod/logvisor/include
../nod/logvisor/fmt/include
../DataSpec
../Runtime
..)
add_compile_definitions(ZE_ATHENA_TYPES=1)
add_shader(CAABoxShader)
target_link_libraries(shader_CAABoxShader PRIVATE hecl-light)
add_shader(CCameraBlurFilter)
target_link_libraries(shader_CCameraBlurFilter PRIVATE hecl-light)
add_shader(CColoredQuadFilter)
target_link_libraries(shader_CColoredQuadFilter PRIVATE hecl-light)
add_shader(CColoredStripShader)
target_link_libraries(shader_CColoredStripShader PRIVATE hecl-light)
add_shader(CDecalShaders)
target_link_libraries(shader_CDecalShaders PRIVATE hecl-light)
add_shader(CElementGenShaders)
target_link_libraries(shader_CElementGenShaders PRIVATE hecl-light)
add_shader(CEnergyBarShader)
target_link_libraries(shader_CEnergyBarShader PRIVATE hecl-light)
add_shader(CEnvFxShaders)
target_link_libraries(shader_CEnvFxShaders PRIVATE hecl-light)
add_shader(CFogVolumeFilter)
target_link_libraries(shader_CFogVolumeFilter PRIVATE hecl-light)
add_shader(CFogVolumePlaneShader)
target_link_libraries(shader_CFogVolumePlaneShader PRIVATE hecl-light)
add_shader(CLineRendererShaders)
target_link_libraries(shader_CLineRendererShaders PRIVATE hecl-light)
add_shader(CMapSurfaceShader)
target_link_libraries(shader_CMapSurfaceShader PRIVATE hecl-light)
add_shader(CMoviePlayerShader)
target_link_libraries(shader_CMoviePlayerShader PRIVATE hecl-light)
add_shader(CNESShader)
target_link_libraries(shader_CNESShader PRIVATE hecl-light)
add_shader(CParticleSwooshShaders)
target_link_libraries(shader_CParticleSwooshShaders PRIVATE hecl-light)
add_shader(CPhazonSuitFilter)
target_link_libraries(shader_CPhazonSuitFilter PRIVATE hecl-light)
add_shader(CRadarPaintShader)
target_link_libraries(shader_CRadarPaintShader PRIVATE hecl-light)
add_shader(CRandomStaticFilter)
target_link_libraries(shader_CRandomStaticFilter PRIVATE hecl-light)
add_shader(CScanLinesFilter)
target_link_libraries(shader_CScanLinesFilter PRIVATE hecl-light)
add_shader(CSpaceWarpFilter)
target_link_libraries(shader_CSpaceWarpFilter PRIVATE hecl-light)
add_shader(CTextSupportShader)
target_link_libraries(shader_CTextSupportShader PRIVATE hecl-light)
add_shader(CTexturedQuadFilter)
target_link_libraries(shader_CTexturedQuadFilter PRIVATE hecl-light)
add_shader(CThermalColdFilter)
target_link_libraries(shader_CThermalColdFilter PRIVATE hecl-light)
add_shader(CThermalHotFilter)
target_link_libraries(shader_CThermalHotFilter PRIVATE hecl-light)
add_shader(CWorldShadowShader)
target_link_libraries(shader_CWorldShadowShader PRIVATE hecl-light)
add_shader(CXRayBlurFilter)
target_link_libraries(shader_CXRayBlurFilter PRIVATE hecl-light)
add_special_shader(shader_CFluidPlaneShader
shader_CFluidPlaneShader.cpp
shader_CFluidPlaneShaderGLSL.cpp
shader_CFluidPlaneShaderHLSL.cpp
shader_CFluidPlaneShaderMetal.cpp)
target_link_libraries(shader_CFluidPlaneShader PRIVATE hecl-light)
add_special_shader(shader_CModelShaders
shader_CModelShadersGLSL.cpp
shader_CModelShadersHLSL.cpp
shader_CModelShadersMetal.cpp)
target_link_libraries(shader_CModelShaders PRIVATE hecl-light nod)
# FIXME hack for DataSpec includes
target_include_directories(shader_CModelShaders PRIVATE ${CMAKE_SOURCE_DIR})

View File

@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10 FATAL_ERROR) # because of c++17
set(TINYXML_LIB_VERSION "5.0.1")
set(TINYXML_LIB_SOVERSION "5")
add_library(tinyxml2_static STATIC tinyxml2/tinyxml2.cpp tinyxml2/tinyxml2.h)
add_library(tinyxml2_static STATIC ../extern/tinyxml2/tinyxml2.cpp ../extern/tinyxml2/tinyxml2.h)
set_target_properties(tinyxml2_static PROPERTIES
COMPILE_DEFINITONS "TINYXML2_EXPORT"
VERSION "${TINYXML_LIB_VERSION}"

View File

View File

View File

View File

View File

View File

View File

0
nod → extern/nod vendored
View File

View File

View File

View File

@ -52,7 +52,6 @@ endforeach()
configure_file(include/hecl/ApplicationReps.hpp.in ${CMAKE_CURRENT_BINARY_DIR}/ApplicationReps.hpp @ONLY)
add_subdirectory(extern)
add_subdirectory(bintoc)
if(NOT TARGET bintoc)

View File

@ -1,5 +0,0 @@
add_subdirectory(boo)
add_subdirectory(libSquish)
add_subdirectory(athena)
add_subdirectory(libpng)
add_subdirectory(libjpeg-turbo)

View File

@ -6,9 +6,9 @@
#include <vector>
#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
#include <xxhash/xxhash.h>
#include "hecl.hpp"
#include "../extern/boo/xxhash/xxhash.h"
namespace hecl::Backend {
struct ExtensionSlot;

View File

@ -9,7 +9,7 @@
#include "hecl/Compilers.hpp"
#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
#include "../extern/boo/xxhash/xxhash.h"
#include <xxhash/xxhash.h>
#define HECL_RUNTIME 1

View File

@ -40,7 +40,7 @@ extern "C" int rep_closefrom(int lower);
#include "logvisor/logvisor.hpp"
#include "athena/Global.hpp"
#include "../extern/boo/xxhash/xxhash.h"
#include "xxhash/xxhash.h"
#include "SystemChar.hpp"
#include "FourCC.hpp"

View File

@ -56,8 +56,7 @@ set(COMMON_SOURCES
ClientProcess.cpp
SteamFinder.cpp
WideStringConvert.cpp
Compilers.cpp
Pipeline.cpp)
Compilers.cpp)
if(UNIX)
list(APPEND PLAT_SRCS closefrom.c)
@ -69,7 +68,8 @@ add_library(hecl-full
${BLENDER_SOURCES}
${COMMON_SOURCES}
${HECL_HEADERS}
${PLAT_SRCS})
${PLAT_SRCS}
Pipeline.cpp)
target_include_directories(hecl-full PUBLIC ../include)
target_link_libraries(hecl-full PUBLIC ${HECL_APPLICATION_REPS_TARGETS_LIST}
hecl-blender-addon boo athena-core logvisor)

View File

@ -1,8 +1,3 @@
add_subdirectory(freetype2)
if (NOT MSVC)
target_compile_options(freetype PRIVATE -Wno-implicit-fallthrough)
endif()
add_subdirectory(resources/fonts)
add_library(specter
@ -94,5 +89,5 @@ target_link_libraries(specter PUBLIC
UrdeLocales
)
target_include_directories(specter PUBLIC include freetype2/include)
target_include_directories(specter PUBLIC include "${CMAKE_SOURCE_DIR}/extern/freetype2/include")
target_atdna(specter atdna_FontCache.cpp include/specter/FontCache.hpp)

View File

@ -1,6 +1,4 @@
include_directories(../../hecl/include
../../hecl/extern/boo/include
../../hecl/extern/boo/logvisor/include
../../nod/logvisor/fmt/include)
add_shader(SpecterViewShaders)
target_link_libraries(shader_SpecterViewShaders PRIVATE hecl-light)
add_shader(SpecterTextViewShaders)
target_link_libraries(shader_SpecterTextViewShaders PRIVATE hecl-light)