Skip to content

Commit ea1d1a3

Browse files
devshgraphicsprogrammingdevshgraphicsprogramming
authored
Merge pull request #325 from buildaworldnet/master
Pre-release Merge
2 parents 0ef6d18 + 1257658 commit ea1d1a3

File tree

1,917 files changed

+170409
-929544
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,917 files changed

+170409
-929544
lines changed

‎.gitignore‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,25 @@
11
# Code::Blocks files
22
*.depend
33
*.layout
4+
# Visual Studio Code
5+
.vscode/*
6+
# temporary compiler files
47
*.objs*
58
*.d
69
*.o
10+
# CEGUI's downloaded dependencies on Windows
11+
3rdparty/CEGUI/cegui-deps-0.8.x-src.zip
12+
# usually where people build
13+
build/*
14+
# default install paths
15+
install/*
16+
# legacy temporary and output directories
17+
lib/*
18+
doctemp/*
719
source/obj
20+
source/Irrlicht/libIrrlichtServer.a
21+
# stuff output by examples
822
examples_tests/06.MeshLoaders/bin/cow.baw
923
examples_tests/06.MeshLoaders/bin/extrusionLogo_TEST_fixed.baw
1024
examples_tests/07.HardwareSkinning/bin/dwarf.baw
11-
source/Irrlicht/libIrrlichtServer.a
12-
lib/*
13-
doctemp/*
14-
.vscode/*
1525

‎.gitmodules‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
[submodule "3rdparty/SPIRV-Headers"]
2+
path = 3rdparty/SPIRV-Headers
3+
url = https://github.com/KhronosGroup/SPIRV-Headers.git
4+
[submodule "3rdparty/SPIRV-Tools"]
5+
path = 3rdparty/SPIRV-Tools
6+
url = https://github.com/KhronosGroup/SPIRV-Tools.git
7+
[submodule "3rdparty/glslang"]
8+
path = 3rdparty/glslang
9+
url = https://github.com/KhronosGroup/glslang.git
10+
[submodule "3rdparty/shaderc"]
11+
path = 3rdparty/shaderc
12+
url = https://github.com/google/shaderc.git
13+
[submodule "3rdparty/bzip2"]
14+
path = 3rdparty/bzip2
15+
url = https://github.com/sergiud/bzip2.git
16+
[submodule "3rdparty/lz4"]
17+
path = 3rdparty/lz4
18+
url = https://github.com/lz4/lz4.git
19+
[submodule "3rdparty/spirv_cross"]
20+
path = 3rdparty/spirv_cross
21+
url = https://github.com/KhronosGroup/SPIRV-Cross.git
22+
[submodule "3rdparty/zlib"]
23+
path = 3rdparty/zlib
24+
url = https://github.com/madler/zlib.git
25+
[submodule "3rdparty/utfcpp"]
26+
path = 3rdparty/utfcpp
27+
url = https://github.com/nemtrif/utfcpp.git
28+
[submodule "3rdparty/convertutf"]
29+
path = 3rdparty/convertutf
30+
url = https://github.com/plenluno/convertutf.git
31+
[submodule "3rdparty/libpng"]
32+
path = 3rdparty/libpng
33+
url = https://github.com/glennrp/libpng.git
34+
[submodule "3rdparty/openssl/openssl"]
35+
path = 3rdparty/openssl/openssl
36+
url = https://github.com/openssl/openssl.git
37+
branch = OpenSSL_1_0_2-stable
38+
[submodule "3rdparty/libjpeg-turbo"]
39+
path = 3rdparty/libjpeg-turbo
40+
url = https://github.com/libjpeg-turbo/libjpeg-turbo.git
41+
[submodule "3rdparty/libjpeg"]
42+
path = 3rdparty/libjpeg
43+
url = https://github.com/LuaDist/libjpeg.git
44+
[submodule "3rdparty/bullet3"]
45+
path = 3rdparty/bullet3
46+
url = https://github.com/bulletphysics/bullet3.git
47+
[submodule "examples_tests/media/cegui_alfisko"]
48+
path = examples_tests/media/cegui_alfisko
49+
url = https://gitlab.com/InnerPieceOSS/cegui_alfisko.git
50+
[submodule "3rdparty/CEGUI/cegui"]
51+
path = 3rdparty/CEGUI/cegui
52+
url = https://gitlab.com/InnerPieceOSS/cegui.git
53+
branch = saga
54+
[submodule "ext/CEGUI/stb"]
55+
path = ext/CEGUI/stb
56+
url = https://github.com/nothings/stb.git
57+
[submodule "3rdparty/portable-file-dialogs"]
58+
path = 3rdparty/portable-file-dialogs
59+
url = https://github.com/samhocevar/portable-file-dialogs.git
60+
[submodule "3rdparty/libexpat"]
61+
path = 3rdparty/libexpat
62+
url = https://github.com/libexpat/libexpat.git
63+
branch = master
64+
[submodule "3rdparty/glm"]
65+
path = 3rdparty/glm
66+
url = https://github.com/g-truc/glm.git
67+
[submodule "3rdparty/freetype2"]
68+
path = 3rdparty/freetype2
69+
url = https://git.sv.nongnu.org/r/freetype/freetype2.git
70+
[submodule "3rdparty/CEGUI/pcre"]
71+
path = 3rdparty/CEGUI/pcre
72+
url = https://github.com/svn2github/pcre.git
73+
[submodule "3rdparty/CEGUI/glew"]
74+
path = 3rdparty/CEGUI/glew
75+
url = https://github.com/Perlmint/glew-cmake.git
76+
branch = master

‎3rdparty/CEGUI/CMakeLists.txt‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
# Copyright (c) 2019 DevSH Graphics Programming Sp. z O.O.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
16+
set(CEGUI_DEPS_BUILD_PATH ${CMAKE_CURRENT_BINARY_DIR}/dependencies/build)
17+
set(CEGUI_DEPS_INSTALL_PATH ${CMAKE_CURRENT_BINARY_DIR}/dependencies/install CACHE INTERNAL "")
18+
19+
execute_process(
20+
COMMAND ${CMAKE_COMMAND} -E make_directory dependencies/build
21+
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
22+
)
23+
24+
function(build_CEGUI_dependency _NAME _SOURCE_PATH)
25+
execute_process(
26+
COMMAND ${CMAKE_COMMAND} -E make_directory ${_NAME}
27+
WORKING_DIRECTORY ${CEGUI_DEPS_BUILD_PATH}
28+
)
29+
if (MSVC)
30+
set(GENERATOR_PLATFORM_OPTION "-A x64")
31+
endif()
32+
execute_process(
33+
COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR}/${_SOURCE_PATH} -G "${CMAKE_GENERATOR}" ${GENERATOR_PLATFORM_OPTION} -DCMAKE_INSTALL_PREFIX=${CEGUI_DEPS_INSTALL_PATH} ${ARGN}
34+
WORKING_DIRECTORY ${CEGUI_DEPS_BUILD_PATH}/${_NAME}
35+
)
36+
execute_process(
37+
COMMAND ${CMAKE_COMMAND} --build ${CEGUI_DEPS_BUILD_PATH}/${_NAME} --target install --config Release -j ${IRR_PARALLEL_BUILD_JOBS}
38+
WORKING_DIRECTORY ${CEGUI_DEPS_BUILD_PATH}/${_NAME}
39+
)
40+
endfunction()
41+
42+
message(STATUS "Building and Pseudo-Installing CEGUI 0.8.x dependencies (because CEGUI's CMake just has to rely on find_package)")
43+
build_CEGUI_dependency(EXPAT ../libexpat/expat "-DBUILD_tools=OFF" "-DBUILD_examples=OFF" "-DBUILD_tests=OFF" "-DBUILD_shared=OFF" "-DBUILD_doc=OFF" "-DUSE_libbsd=OFF" "-DMSVC_USE_STATIC_CRT=ON")
44+
if (IRR_FAST_MATH)
45+
build_CEGUI_dependency(GLM ../glm "-DBUILD_SHARED_LIBS=OFF" "-DBUILD_STATIC_LIBS=OFF" "-DGLM_TEST_ENABLE_CXX_14=ON" "-DGLM_TEST_ENABLE_FAST_MATH=ON" "-DGLM_TEST_ENABLE_SIMD_SSE4_2=ON" "-DGLM_TEST_ENABLE=OFF")
46+
else()
47+
build_CEGUI_dependency(GLM ../glm "-DBUILD_SHARED_LIBS=OFF" "-DBUILD_STATIC_LIBS=OFF" "-DGLM_TEST_ENABLE_CXX_14=ON" "-DGLM_TEST_ENABLE_SIMD_SSE4_2=ON" "-DGLM_TEST_ENABLE=OFF")
48+
endif()
49+
build_CEGUI_dependency(Freetype ../freetype2 "-DBUILD_SHARED_LIBS=OFF" "-DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE" "-DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE")
50+
build_CEGUI_dependency(PCRE ./pcre "-DPCRE_SUPPORT_UTF=ON" "-DBUILD_SHARED_LIBS=OFF" "-DPCRE_BUILD_PCREGREP=OFF" "-DPCRE_BUILD_TESTS=OFF" "-DBUILD_doc=OFF")
51+
build_CEGUI_dependency(GLEW ./glew/build/cmake "-Dglew-cmake_BUILD_SHARED=OFF" "-Dglew-cmake_BUILD_MULTI_CONTEXT=OFF")
52+
#build_CEGUI_dependency(GLEW ./glew/build/cmake "-Dglew-cmake_BUILD_SHARED=OFF" "-DUSE_GLEW=OFF")
53+
message(STATUS "CEGUI 0.8.x dependencies built and pseudo-installed")
54+
55+
56+
# Disable unused CEGUI options
57+
set(CEGUI_INSTALL_PKGCONFIG OFF CACHE BOOL "")
58+
set(CEGUI_BUILD_APPLICATION_TEMPLATES OFF CACHE BOOL "")
59+
set(CEGUI_BUILD_PYTHON_MODULES OFF CACHE BOOL "")
60+
set(CEGUI_BUILD_LUA_MODULE OFF CACHE BOOL "")
61+
set(CEGUI_BUILD_XMLPARSER_XERCES OFF CACHE BOOL "")
62+
set(CEGUI_BUILD_XMLPARSER_TINYXML OFF CACHE BOOL "")
63+
set(CEGUI_BUILD_XMLPARSER_TINYXML2 OFF CACHE BOOL "")
64+
set(CEGUI_BUILD_XMLPARSER_LIBXML2 OFF CACHE BOOL "")
65+
set(CEGUI_BUILD_XMLPARSER_RAPIDXML OFF CACHE BOOL "")
66+
set(CEGUI_BUILD_RENDERER_OPENGL OFF CACHE BOOL "")
67+
set(CEGUI_USE_FRIBIDI OFF CACHE BOOL "") # enable when Hebrew and Arabic users complain
68+
set(CEGUI_USE_MINIBIDI OFF CACHE BOOL "")
69+
set(CEGUI_SAMPLES_ENABLED OFF CACHE BOOL "")
70+
71+
# Enable required CEGUI options
72+
set(CEGUI_STRING_CLASS "2" CACHE STRING "")
73+
set(CEGUI_HAS_FREETYPE ON CACHE BOOL "")
74+
set(CEGUI_HAS_PCRE_REGEX ON CACHE BOOL "")
75+
set(CEGUI_BUILD_XMLPARSER_EXPAT ON CACHE BOOL "")
76+
set(CEGUI_BUILD_IMAGECODEC_STB ON CACHE BOOL "") # needs at least 1 image codec module
77+
set(CEGUI_BUILD_RENDERER_OPENGL3 ON CACHE BOOL "")
78+
set(CEGUI_BUILD_STATIC_CONFIGURATION ON CACHE BOOL "")
79+
set(CEGUI_BUILD_STATIC_FACTORY_MODULE ON CACHE BOOL "")
80+
set(CEGUI_STATIC_XMLPARSER_MODULE "CEGUIExpatParser" CACHE STRING "")
81+
82+
83+
set(CEGUI_STATIC_DEPENDENCIES ON CACHE BOOL "")
84+
set(CEGUI_BUILD_SHARED_LIBS_WITH_STATIC_DEPENDENCIES ON CACHE BOOL "") # util someone patches CEGUI to define GLEW_STATIC when the above is enabled as well
85+
86+
87+
# override find_package
88+
set(_OLD_CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH})
89+
set(CMAKE_PREFIX_PATH ${CEGUI_DEPS_INSTALL_PATH})
90+
find_package(EXPAT REQUIRED)
91+
find_package(Freetype REQUIRED)
92+
find_package(GLEW REQUIRED)
93+
find_package(PCRE REQUIRED)
94+
add_subdirectory(cegui EXCLUDE_FROM_ALL)
95+
set(CMAKE_PREFIX_PATH ${_OLD_CMAKE_PREFIX_PATH})

‎3rdparty/CEGUI/cegui‎

Submodule cegui added at 160161a

‎3rdparty/CEGUI/glew‎

Submodule glew added at c14a7a1

‎3rdparty/CEGUI/pcre‎

Submodule pcre added at 4e39658

0 commit comments

Comments
 (0)