mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-03-22 06:55:02 +01:00
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -26,6 +26,3 @@
|
|||||||
[submodule "ref/vcpkg"]
|
[submodule "ref/vcpkg"]
|
||||||
path = ref/vcpkg
|
path = ref/vcpkg
|
||||||
url = https://github.com/microsoft/vcpkg.git
|
url = https://github.com/microsoft/vcpkg.git
|
||||||
[submodule "ref/tgui"]
|
|
||||||
path = ref/tgui
|
|
||||||
url = https://github.com/texus/TGUI
|
|
||||||
|
|||||||
@@ -69,7 +69,6 @@ option(WITH_BETTER_RENDERER "Experimental multi-backend renderer based on NVRHI"
|
|||||||
option(GENERATE_PDB "Generate executable with program debugging symbols" ON)
|
option(GENERATE_PDB "Generate executable with program debugging symbols" ON)
|
||||||
option(ENABLE_MCC "Enable multicore compilation" ON)
|
option(ENABLE_MCC "Enable multicore compilation" ON)
|
||||||
option(WITHDUMPGEN "Enable generating DMP files on crash" ON)
|
option(WITHDUMPGEN "Enable generating DMP files on crash" ON)
|
||||||
option(WITH_TGUI "Enable TGUI interface" ON)
|
|
||||||
|
|
||||||
set(BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
|
set(BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
|
||||||
|
|
||||||
@@ -492,27 +491,6 @@ else()
|
|||||||
target_compile_definitions(${PROJECT_NAME} PUBLIC WITH_DISCORD_RPC=0)
|
target_compile_definitions(${PROJECT_NAME} PUBLIC WITH_DISCORD_RPC=0)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (WITH_TGUI)
|
|
||||||
find_package(Freetype REQUIRED)
|
|
||||||
target_link_libraries(${PROJECT_NAME} Freetype::Freetype)
|
|
||||||
|
|
||||||
set(TGUI_SHARED_LIBS OFF CACHE BOOL "Build static libs" FORCE)
|
|
||||||
set(TGUI_BACKEND "GLFW_OPENGL3" CACHE STRING "TGUI backend")
|
|
||||||
|
|
||||||
add_subdirectory(ref/tgui)
|
|
||||||
set_target_properties(tgui PROPERTIES FOLDER "libraries")
|
|
||||||
|
|
||||||
target_link_libraries(${PROJECT_NAME} tgui)
|
|
||||||
target_include_directories(${PROJECT_NAME} PUBLIC
|
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/ref/tgui/include"
|
|
||||||
)
|
|
||||||
|
|
||||||
target_compile_definitions(${PROJECT_NAME} PUBLIC WITH_TGUI=1)
|
|
||||||
else()
|
|
||||||
target_compile_definitions(${PROJECT_NAME} PUBLIC WITH_TGUI=0)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
find_package(OpenAL REQUIRED)
|
find_package(OpenAL REQUIRED)
|
||||||
if (TARGET OpenAL::OpenAL)
|
if (TARGET OpenAL::OpenAL)
|
||||||
|
|||||||
1
ref/tgui
1
ref/tgui
Submodule ref/tgui deleted from 17b31539f4
@@ -3,6 +3,5 @@ echo Preparing vcpkg packages
|
|||||||
cd ref\vcpkg
|
cd ref\vcpkg
|
||||||
call bootstrap-vcpkg.bat
|
call bootstrap-vcpkg.bat
|
||||||
vcpkg install directx-dxc:x64-windows
|
vcpkg install directx-dxc:x64-windows
|
||||||
vcpkg install freetype:x64-windows
|
|
||||||
cd ..\..
|
cd ..\..
|
||||||
@echo ON
|
@echo ON
|
||||||
|
|||||||
@@ -10,9 +10,6 @@ http://mozilla.org/MPL/2.0/.
|
|||||||
#include "stdafx.h"
|
#include "stdafx.h"
|
||||||
#include "uilayer.h"
|
#include "uilayer.h"
|
||||||
|
|
||||||
#include "TGUI/TGUI.hpp"
|
|
||||||
#include <TGUI/Backend/GLFW-OpenGL3.hpp>
|
|
||||||
|
|
||||||
#include "Globals.h"
|
#include "Globals.h"
|
||||||
#include "renderer.h"
|
#include "renderer.h"
|
||||||
#include "Logs.h"
|
#include "Logs.h"
|
||||||
|
|||||||
Reference in New Issue
Block a user