Skip to content

Commit

Permalink
- implemented static linking
Browse files Browse the repository at this point in the history
  • Loading branch information
chiappa committed Jan 27, 2022
1 parent 5b4d0ce commit 210e4f4
Show file tree
Hide file tree
Showing 27 changed files with 330 additions and 291 deletions.
4 changes: 2 additions & 2 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@
"generator": "Visual Studio 17 2022",
"cacheVariables": {
"CMAKE_SYSTEM_VERSION": "10",
"OPTION_EDITOR": "ON",
"OPTION_EDITOR": "OFF",
"OPTION_STATIC_LINKING": "ON",
"QT_SDK_ROOT" : "C:",

"VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/Tools/CMake/toolchain/windows/WindowsPC-MSVC.cmake",
"USE_MSVC": "ON"
}
Expand Down
2 changes: 1 addition & 1 deletion Code/Engine/3DEngine/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ add_sources(
"Scene/XmlSerialization.cpp"
"World/World.cpp")
end_sources()
EngineModule(3DEngine FORCE_SHARED_WIN PCH "pch.hpp" SOLUTION_FOLDER "Engine")
EngineModule(3DEngine PCH "pch.hpp" SOLUTION_FOLDER "Engine")

target_link_libraries(${THIS_PROJECT} PRIVATE Math)
target_link_libraries(${THIS_PROJECT} PUBLIC tinyxml2::tinyxml2)
Expand Down
2 changes: 2 additions & 0 deletions Code/Engine/Common/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ add_sources(
${INC}/Core/Platform/_CryLibrary.h
${INC}/Core/Platform/platform_impl.inl
${INC}/Core/Platform/platform_impl_winapi.inl
SOURCE_GROUP "Core\\\\Platform"
${INC}/Core/Platform/Project/ProjectDefines.hpp
SOURCE_GROUP "EntitySystem"
${INC}/EntitySystem/EntityDesc.hpp
${INC}/EntitySystem/IEntityRenderState.hpp
Expand Down
2 changes: 1 addition & 1 deletion Code/Engine/EntitySystem/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ add_sources(
)
end_sources()

EngineModule(EntitySystem FORCE_SHARED_WIN PCH "pch.hpp" SOLUTION_FOLDER
EngineModule(EntitySystem PCH "pch.hpp" SOLUTION_FOLDER
"Engine")
target_link_libraries(${THIS_PROJECT} PRIVATE Math)
target_link_libraries(${THIS_PROJECT} PRIVATE Utils)
3 changes: 3 additions & 0 deletions Code/Engine/Entry/Main.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#if 0
#define _LAUNCHER
#include <BlackBox/Core/Platform/Platform.hpp>
#include <BlackBox/Core/Platform/platform_impl.inl>
#include <BlackBox/System/ILog.hpp>
Expand Down Expand Up @@ -46,3 +48,4 @@ int main(int argc, char* argv[])

return status;
}
#endif
2 changes: 1 addition & 1 deletion Code/Engine/Input/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ add_sources(
"SDLPad.cpp")
end_sources()

EngineModule(Input FORCE_SHARED_WIN PCH "pch.hpp" SOLUTION_FOLDER "Engine")
EngineModule(Input PCH "pch.hpp" SOLUTION_FOLDER "Engine")

if(OPTION_USE_LINUXINPUT)
target_compile_definitions(${THIS_PROJECT} PUBLIC -DUSE_LINUXINPUT)
Expand Down
2 changes: 1 addition & 1 deletion Code/Engine/Network/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ add_sources(
"Network.cpp"
"Server.cpp")
end_sources()
EngineModule(Network FORCE_SHARED_WIN PCH "pch.hpp" SOLUTION_FOLDER "Engine")
EngineModule(Network PCH "pch.hpp" SOLUTION_FOLDER "Engine")
add_sdl(${THIS_PROJECT})
set(PROJECT_NAME ${THIS_PROJECT})
add_sdl_net()
Expand Down
2 changes: 1 addition & 1 deletion Code/Engine/Physics/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ add_sources(
)
end_sources()

EngineModule(Physics FORCE_SHARED_WIN PCH "pch.hpp" SOLUTION_FOLDER
EngineModule(Physics PCH "pch.hpp" SOLUTION_FOLDER

"Engine")
target_link_libraries(${THIS_PROJECT} PRIVATE Math)
Expand Down
5 changes: 2 additions & 3 deletions Code/Engine/Renderer/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,7 @@ endmacro()

if(OPTION_DX_RENDERER)
message(STATUS "Using D3D11 Renderer Backend")
EngineModule(RenderD3D11 FORCE_SHARED_WIN PCH
"${CMAKE_CURRENT_SOURCE_DIR}/pch.hpp" SOLUTION_FOLDER "Engine")
EngineModule(RenderD3D11 PCH "${CMAKE_CURRENT_SOURCE_DIR}/pch.hpp" SOLUTION_FOLDER "Engine")
add_common_libs()
add_common_includes()

Expand All @@ -104,7 +103,7 @@ else()
cryfilecontainer(RenderD3D11 SOLUTION_FOLDER "Engine")
endif()
if(OPTION_VK_RENDERER)
EngineModule(RendererVK FORCE_SHARED_WIN PCH "pch.hpp" SOLUTION_FOLDER
EngineModule(RendererVK PCH "pch.hpp" SOLUTION_FOLDER
"Engine")
add_common_libs()
add_common_includes()
Expand Down
252 changes: 126 additions & 126 deletions Code/Engine/Renderer/Shaders/Parser.cpp

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions Code/Engine/Renderer/Shaders/Parser.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@


/**
** \file /cygdrive/c/Users/chiap/source/repos/TestEngine/Code/Engine/Renderer/Shaders/Parser.hpp
** \file /cygdrive/c/Users/chiap/source/repos/fromasmtodisasm/BlackBox/Code/Engine/Renderer/Shaders/Parser.hpp
** Define the yy::parser class.
*/

Expand All @@ -42,10 +42,10 @@
// especially those whose name start with YY_ or yy_. They are
// private implementation details that can be changed or removed.

#ifndef YY_YY_CYGDRIVE_C_USERS_CHIAP_SOURCE_REPOS_TESTENGINE_CODE_ENGINE_RENDERER_SHADERS_PARSER_HPP_INCLUDED
# define YY_YY_CYGDRIVE_C_USERS_CHIAP_SOURCE_REPOS_TESTENGINE_CODE_ENGINE_RENDERER_SHADERS_PARSER_HPP_INCLUDED
#ifndef YY_YY_CYGDRIVE_C_USERS_CHIAP_SOURCE_REPOS_FROMASMTODISASM_BLACKBOX_CODE_ENGINE_RENDERER_SHADERS_PARSER_HPP_INCLUDED
# define YY_YY_CYGDRIVE_C_USERS_CHIAP_SOURCE_REPOS_FROMASMTODISASM_BLACKBOX_CODE_ENGINE_RENDERER_SHADERS_PARSER_HPP_INCLUDED
// "%code requires" blocks.
#line 12 "/cygdrive/c/Users/chiap/source/repos/TestEngine/Code/Engine/Renderer/Shaders/Parser.yy"
#line 12 "/cygdrive/c/Users/chiap/source/repos/fromasmtodisasm/BlackBox/Code/Engine/Renderer/Shaders/Parser.yy"

#undef new
#include <string>
Expand Down Expand Up @@ -143,7 +143,7 @@



#line 147 "/cygdrive/c/Users/chiap/source/repos/TestEngine/Code/Engine/Renderer/Shaders/Parser.hpp"
#line 147 "/cygdrive/c/Users/chiap/source/repos/fromasmtodisasm/BlackBox/Code/Engine/Renderer/Shaders/Parser.hpp"

# include <cassert>
# include <cstdlib> // std::abort
Expand Down Expand Up @@ -283,7 +283,7 @@
#endif

namespace yy {
#line 287 "/cygdrive/c/Users/chiap/source/repos/TestEngine/Code/Engine/Renderer/Shaders/Parser.hpp"
#line 287 "/cygdrive/c/Users/chiap/source/repos/fromasmtodisasm/BlackBox/Code/Engine/Renderer/Shaders/Parser.hpp"



Expand Down Expand Up @@ -3151,9 +3151,9 @@ switch (yykind)


} // yy
#line 3155 "/cygdrive/c/Users/chiap/source/repos/TestEngine/Code/Engine/Renderer/Shaders/Parser.hpp"
#line 3155 "/cygdrive/c/Users/chiap/source/repos/fromasmtodisasm/BlackBox/Code/Engine/Renderer/Shaders/Parser.hpp"




#endif // !YY_YY_CYGDRIVE_C_USERS_CHIAP_SOURCE_REPOS_TESTENGINE_CODE_ENGINE_RENDERER_SHADERS_PARSER_HPP_INCLUDED
#endif // !YY_YY_CYGDRIVE_C_USERS_CHIAP_SOURCE_REPOS_FROMASMTODISASM_BLACKBOX_CODE_ENGINE_RENDERER_SHADERS_PARSER_HPP_INCLUDED
Loading

0 comments on commit 210e4f4

Please sign in to comment.