temporarily removing boost

This commit is contained in:
Dynamitos
2021-11-18 12:48:21 +01:00
parent 42b0d5034c
commit f20ef8d1b1
11 changed files with 16 additions and 21 deletions
+1 -4
View File
@@ -1,6 +1,3 @@
[submodule "external/boost"]
path = external/boost
url = https://github.com/boostorg/boost
[submodule "external/glm"]
path = external/glm
url = https://github.com/g-truc/glm.git
@@ -23,4 +20,4 @@
url = https://github.com/nothings/stb
[submodule "external/slang"]
path = external/slang
url = https://github.com/shader-slang/slang.git
url = https://github.com/shader-slang/slang.git
+7 -11
View File
@@ -22,16 +22,6 @@ set(NSAM_ROOT ${EXTERNAL_ROOT}/aftermath)
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)
project (SUPERBUILD NONE)
# execute the superbuild (this script will be invoked again without the
@@ -42,6 +32,12 @@ else()
project (Seele)
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(Boost REQUIRED COMPONENTS serialization)
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_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 ${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>)
else()
add_custom_target(copy-binaries ALL COMMAND "")
+1 -1
View File
@@ -27,7 +27,7 @@ endif()
ExternalProject_Add(boost
SOURCE_DIR ${BOOST_ROOT}
CONFIGURE_COMMAND ./bootstrap.${BOOTSTRAP_EXTENSION} --with-libraries=serialization,test
BUILD_COMMAND ./b2 -d0
BUILD_COMMAND ./b2 -d0 -link=shared
BUILD_IN_SOURCE 1
INSTALL_COMMAND "")
-1
Submodule external/boost deleted from 4d8de5a695
@@ -1,7 +1,6 @@
#pragma once
#include "MinimalEngine.h"
#include "Graphics/GraphicsResources.h"
#include "RenderPass.h"
namespace Seele
{
+1 -1
View File
@@ -1,13 +1,13 @@
#pragma once
#include "MinimalEngine.h"
#include "Math/Math.h"
#include "RenderGraph.h"
namespace Seele
{
DECLARE_NAME_REF(Gfx, Viewport)
DECLARE_NAME_REF(Gfx, Graphics)
DECLARE_NAME_REF(Gfx, RenderPass)
DECLARE_REF(RenderGraphResources)
template<typename RenderPassDataType>
class RenderPass
{
@@ -59,6 +59,8 @@ VertexShaderInput::~VertexShaderInput()
{
}
void VertexShaderInput::init(Gfx::PGraphics) {}
void VertexShaderInput::getStreams(VertexInputStreamArray& outVertexStreams) const
{
for(uint32 i = 0; i < streams.size(); ++i)
+1 -1
View File
@@ -117,7 +117,7 @@ class VertexShaderInput
public:
VertexShaderInput(std::string name);
virtual ~VertexShaderInput();
virtual void init(Gfx::PGraphics) {}
virtual void init(Gfx::PGraphics);
void getStreams(VertexInputStreamArray& outVertexStreams) const;
void getPositionOnlyStream(VertexInputStreamArray& outVertexStreams) const;
virtual bool supportsTesselation() { return false; }
-1
View File
@@ -47,7 +47,6 @@ ThreadPool::~ThreadPool()
void ThreadPool::addJob(Job&& job)
{
std::unique_lock lock(jobQueueLock);
//std::cout << "Adding job " << job << std::endl;
jobQueue.add(std::move(job));
jobQueueCV.notify_one();
}
+1
View File
@@ -1,5 +1,6 @@
#pragma once
#include <thread>
#include <coroutine>
#include "MinimalEngine.h"
#include "Containers/List.h"
+2
View File
@@ -13,6 +13,8 @@ target_precompile_headers(Seele_unit_tests
<assert.h>
<memory>
<atomic>
<coroutine>
<thread>
<cstring>
<iostream>
<string>