temporarily removing boost
This commit is contained in:
+1
-4
@@ -1,6 +1,3 @@
|
|||||||
[submodule "external/boost"]
|
|
||||||
path = external/boost
|
|
||||||
url = https://github.com/boostorg/boost
|
|
||||||
[submodule "external/glm"]
|
[submodule "external/glm"]
|
||||||
path = external/glm
|
path = external/glm
|
||||||
url = https://github.com/g-truc/glm.git
|
url = https://github.com/g-truc/glm.git
|
||||||
@@ -23,4 +20,4 @@
|
|||||||
url = https://github.com/nothings/stb
|
url = https://github.com/nothings/stb
|
||||||
[submodule "external/slang"]
|
[submodule "external/slang"]
|
||||||
path = external/slang
|
path = external/slang
|
||||||
url = https://github.com/shader-slang/slang.git
|
url = https://github.com/shader-slang/slang.git
|
||||||
+7
-11
@@ -22,16 +22,6 @@ set(NSAM_ROOT ${EXTERNAL_ROOT}/aftermath)
|
|||||||
|
|
||||||
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/)
|
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/)
|
||||||
|
|
||||||
set(Boost_USE_STATIC_LIBS OFF)
|
|
||||||
if(WIN32)
|
|
||||||
set(Boost_LIB_PREFIX lib)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE})
|
|
||||||
#Workaround for vs, because it places artifacts into an additional subfolder
|
|
||||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_SOURCE_DIR}/bin/Debug)
|
|
||||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_CURRENT_SOURCE_DIR}/bin/Release)
|
|
||||||
|
|
||||||
if (USE_SUPERBUILD)
|
if (USE_SUPERBUILD)
|
||||||
project (SUPERBUILD NONE)
|
project (SUPERBUILD NONE)
|
||||||
# execute the superbuild (this script will be invoked again without the
|
# execute the superbuild (this script will be invoked again without the
|
||||||
@@ -42,6 +32,12 @@ else()
|
|||||||
project (Seele)
|
project (Seele)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE})
|
||||||
|
#Workaround for vs, because it places artifacts into an additional subfolder
|
||||||
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_SOURCE_DIR}/bin/Debug)
|
||||||
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_CURRENT_SOURCE_DIR}/bin/Release)
|
||||||
|
|
||||||
|
|
||||||
find_package(Vulkan REQUIRED)
|
find_package(Vulkan REQUIRED)
|
||||||
find_package(Boost REQUIRED COMPONENTS serialization)
|
find_package(Boost REQUIRED COMPONENTS serialization)
|
||||||
find_package(Threads REQUIRED)
|
find_package(Threads REQUIRED)
|
||||||
@@ -122,7 +118,7 @@ if(WIN32)
|
|||||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SLANG_BINARIES} $<TARGET_FILE_DIR:SeeleEngine>
|
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SLANG_BINARIES} $<TARGET_FILE_DIR:SeeleEngine>
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SLANG_GLSLANG} $<TARGET_FILE_DIR:SeeleEngine>
|
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SLANG_GLSLANG} $<TARGET_FILE_DIR:SeeleEngine>
|
||||||
#COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GLFW_BINARY} $<TARGET_FILE_DIR:SeeleEngine>
|
#COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GLFW_BINARY} $<TARGET_FILE_DIR:SeeleEngine>
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${ASSIMP_BINARY} $<TARGET_FILE_DIR:SeeleEngine>
|
#COMMAND ${CMAKE_COMMAND} -E copy_if_different ${ASSIMP_BINARY} $<TARGET_FILE_DIR:SeeleEngine>
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${NSAM_BINARIES} $<TARGET_FILE_DIR:SeeleEngine>)
|
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${NSAM_BINARIES} $<TARGET_FILE_DIR:SeeleEngine>)
|
||||||
else()
|
else()
|
||||||
add_custom_target(copy-binaries ALL COMMAND "")
|
add_custom_target(copy-binaries ALL COMMAND "")
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ endif()
|
|||||||
ExternalProject_Add(boost
|
ExternalProject_Add(boost
|
||||||
SOURCE_DIR ${BOOST_ROOT}
|
SOURCE_DIR ${BOOST_ROOT}
|
||||||
CONFIGURE_COMMAND ./bootstrap.${BOOTSTRAP_EXTENSION} --with-libraries=serialization,test
|
CONFIGURE_COMMAND ./bootstrap.${BOOTSTRAP_EXTENSION} --with-libraries=serialization,test
|
||||||
BUILD_COMMAND ./b2 -d0
|
BUILD_COMMAND ./b2 -d0 -link=shared
|
||||||
BUILD_IN_SOURCE 1
|
BUILD_IN_SOURCE 1
|
||||||
INSTALL_COMMAND "")
|
INSTALL_COMMAND "")
|
||||||
|
|
||||||
|
|||||||
Vendored
-1
Submodule external/boost deleted from 4d8de5a695
@@ -1,7 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
#include "MinimalEngine.h"
|
#include "MinimalEngine.h"
|
||||||
#include "Graphics/GraphicsResources.h"
|
#include "Graphics/GraphicsResources.h"
|
||||||
#include "RenderPass.h"
|
|
||||||
|
|
||||||
namespace Seele
|
namespace Seele
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
#include "MinimalEngine.h"
|
#include "MinimalEngine.h"
|
||||||
#include "Math/Math.h"
|
#include "Math/Math.h"
|
||||||
|
#include "RenderGraph.h"
|
||||||
|
|
||||||
namespace Seele
|
namespace Seele
|
||||||
{
|
{
|
||||||
DECLARE_NAME_REF(Gfx, Viewport)
|
DECLARE_NAME_REF(Gfx, Viewport)
|
||||||
DECLARE_NAME_REF(Gfx, Graphics)
|
DECLARE_NAME_REF(Gfx, Graphics)
|
||||||
DECLARE_NAME_REF(Gfx, RenderPass)
|
DECLARE_NAME_REF(Gfx, RenderPass)
|
||||||
DECLARE_REF(RenderGraphResources)
|
|
||||||
template<typename RenderPassDataType>
|
template<typename RenderPassDataType>
|
||||||
class RenderPass
|
class RenderPass
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -59,6 +59,8 @@ VertexShaderInput::~VertexShaderInput()
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void VertexShaderInput::init(Gfx::PGraphics) {}
|
||||||
|
|
||||||
void VertexShaderInput::getStreams(VertexInputStreamArray& outVertexStreams) const
|
void VertexShaderInput::getStreams(VertexInputStreamArray& outVertexStreams) const
|
||||||
{
|
{
|
||||||
for(uint32 i = 0; i < streams.size(); ++i)
|
for(uint32 i = 0; i < streams.size(); ++i)
|
||||||
|
|||||||
@@ -117,7 +117,7 @@ class VertexShaderInput
|
|||||||
public:
|
public:
|
||||||
VertexShaderInput(std::string name);
|
VertexShaderInput(std::string name);
|
||||||
virtual ~VertexShaderInput();
|
virtual ~VertexShaderInput();
|
||||||
virtual void init(Gfx::PGraphics) {}
|
virtual void init(Gfx::PGraphics);
|
||||||
void getStreams(VertexInputStreamArray& outVertexStreams) const;
|
void getStreams(VertexInputStreamArray& outVertexStreams) const;
|
||||||
void getPositionOnlyStream(VertexInputStreamArray& outVertexStreams) const;
|
void getPositionOnlyStream(VertexInputStreamArray& outVertexStreams) const;
|
||||||
virtual bool supportsTesselation() { return false; }
|
virtual bool supportsTesselation() { return false; }
|
||||||
|
|||||||
@@ -47,7 +47,6 @@ ThreadPool::~ThreadPool()
|
|||||||
void ThreadPool::addJob(Job&& job)
|
void ThreadPool::addJob(Job&& job)
|
||||||
{
|
{
|
||||||
std::unique_lock lock(jobQueueLock);
|
std::unique_lock lock(jobQueueLock);
|
||||||
//std::cout << "Adding job " << job << std::endl;
|
|
||||||
jobQueue.add(std::move(job));
|
jobQueue.add(std::move(job));
|
||||||
jobQueueCV.notify_one();
|
jobQueueCV.notify_one();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
#include <thread>
|
#include <thread>
|
||||||
|
#include <coroutine>
|
||||||
#include "MinimalEngine.h"
|
#include "MinimalEngine.h"
|
||||||
#include "Containers/List.h"
|
#include "Containers/List.h"
|
||||||
|
|
||||||
|
|||||||
@@ -13,6 +13,8 @@ target_precompile_headers(Seele_unit_tests
|
|||||||
<assert.h>
|
<assert.h>
|
||||||
<memory>
|
<memory>
|
||||||
<atomic>
|
<atomic>
|
||||||
|
<coroutine>
|
||||||
|
<thread>
|
||||||
<cstring>
|
<cstring>
|
||||||
<iostream>
|
<iostream>
|
||||||
<string>
|
<string>
|
||||||
|
|||||||
Reference in New Issue
Block a user