Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
111 changes: 111 additions & 0 deletions ports/ezfoundation/disable-warnings-as-errors.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
diff --git a/Code/BuildSystem/CMake/ezUtilsCppFlags.cmake b/Code/BuildSystem/CMake/ezUtilsCppFlags.cmake
index 07ae85f..760d300 100644
--- a/Code/BuildSystem/CMake/ezUtilsCppFlags.cmake
+++ b/Code/BuildSystem/CMake/ezUtilsCppFlags.cmake
@@ -46,7 +46,6 @@ function(ez_set_build_flags_msvc TARGET_NAME)

# /WX: treat warnings as errors
if (NOT ${ARG_NO_WARNINGS_AS_ERRORS} AND NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
- target_compile_options(${TARGET_NAME} PRIVATE "/WX")
endif()

if ((CMAKE_SIZEOF_VOID_P EQUAL 4) AND EZ_CMAKE_ARCHITECTURE_X86)
@@ -168,7 +167,6 @@ function(ez_set_build_flags_clang TARGET_NAME)
endif()

if(NOT (CMAKE_CURRENT_SOURCE_DIR MATCHES "Code/ThirdParty"))
- target_compile_options(${TARGET_NAME} PRIVATE -Werror=inconsistent-missing-override -Werror=switch -Werror=uninitialized)
else()
Comment thread
BillyONeal marked this conversation as resolved.
# Ignore all warnings in third party code.
target_compile_options(${TARGET_NAME} PRIVATE -Wno-everything)
diff --git a/Code/Engine/Core/CMakeLists.txt b/Code/Engine/Core/CMakeLists.txt
index 291d494..54eb04d 100644
--- a/Code/Engine/Core/CMakeLists.txt
+++ b/Code/Engine/Core/CMakeLists.txt
@@ -8,7 +8,7 @@ get_filename_component(PROJECT_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME_WE)
ez_create_target(LIBRARY ${PROJECT_NAME})

if(MSVC)
- target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX)
+ target_compile_options(${PROJECT_NAME} PRIVATE /W4)
endif()

target_link_libraries(${PROJECT_NAME}
diff --git a/Code/Engine/Foundation/CMakeLists.txt b/Code/Engine/Foundation/CMakeLists.txt
index 2cb3ece..695f510 100644
--- a/Code/Engine/Foundation/CMakeLists.txt
+++ b/Code/Engine/Foundation/CMakeLists.txt
@@ -14,7 +14,7 @@ if(EZ_CMAKE_PLATFORM_WINDOWS)
endif()

if (MSVC)
- target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX)
+ target_compile_options(${PROJECT_NAME} PRIVATE /W4)
endif()

if (EZ_CMAKE_PLATFORM_LINUX)
diff --git a/Code/Engine/RendererDX11/CMakeLists.txt b/Code/Engine/RendererDX11/CMakeLists.txt
index adcfc2e..d53d3c1 100644
--- a/Code/Engine/RendererDX11/CMakeLists.txt
+++ b/Code/Engine/RendererDX11/CMakeLists.txt
@@ -11,7 +11,7 @@ ez_create_target(LIBRARY ${PROJECT_NAME})
ez_link_target_dx11(${PROJECT_NAME})

if(MSVC)
- target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX)
+ target_compile_options(${PROJECT_NAME} PRIVATE /W4)
endif()

target_link_libraries(${PROJECT_NAME}
diff --git a/Code/Engine/RendererFoundation/CMakeLists.txt b/Code/Engine/RendererFoundation/CMakeLists.txt
index 5e6376f..073e97e 100644
--- a/Code/Engine/RendererFoundation/CMakeLists.txt
+++ b/Code/Engine/RendererFoundation/CMakeLists.txt
@@ -8,7 +8,7 @@ get_filename_component(PROJECT_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME_WE)
ez_create_target(LIBRARY ${PROJECT_NAME})

if(MSVC)
- target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX)
+ target_compile_options(${PROJECT_NAME} PRIVATE /W4)
endif()

target_link_libraries(${PROJECT_NAME}
diff --git a/Code/Engine/Texture/CMakeLists.txt b/Code/Engine/Texture/CMakeLists.txt
index a26558c..9bd433c 100644
--- a/Code/Engine/Texture/CMakeLists.txt
+++ b/Code/Engine/Texture/CMakeLists.txt
@@ -6,7 +6,7 @@ get_filename_component(PROJECT_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME_WE)
ez_create_target(LIBRARY ${PROJECT_NAME} EXCLUDE_FOLDER_FOR_UNITY DirectXTex)

if(MSVC)
- target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX)
+ target_compile_options(${PROJECT_NAME} PRIVATE /W4)
endif()

target_link_libraries(${PROJECT_NAME}
diff --git a/Code/Engine/Texture/DirectXTex/Shaders/CompileShaders.cmd b/Code/Engine/Texture/DirectXTex/Shaders/CompileShaders.cmd
index d1d977c..a8bad33 100644
--- a/Code/Engine/Texture/DirectXTex/Shaders/CompileShaders.cmd
+++ b/Code/Engine/Texture/DirectXTex/Shaders/CompileShaders.cmd
@@ -5,7 +5,7 @@ rem Licensed under the MIT License.
setlocal
set error=0

-set FXCOPTS=/nologo /WX /Ges /Zi /Zpc /Qstrip_reflect /Qstrip_debug
+set FXCOPTS=/nologo /Ges /Zi /Zpc /Qstrip_reflect /Qstrip_debug

set PCFXC="%WindowsSdkVerBinPath%x86\fxc.exe"
if exist %PCFXC% goto continue
diff --git a/Code/Engine/Utilities/CMakeLists.txt b/Code/Engine/Utilities/CMakeLists.txt
index 4109c31..43cd139 100644
--- a/Code/Engine/Utilities/CMakeLists.txt
+++ b/Code/Engine/Utilities/CMakeLists.txt
@@ -8,7 +8,7 @@ get_filename_component(PROJECT_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME_WE)
ez_create_target(LIBRARY ${PROJECT_NAME})

if(MSVC)
- target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX)
+ target_compile_options(${PROJECT_NAME} PRIVATE /W4)
endif()

target_link_libraries(${PROJECT_NAME}
Original file line number Diff line number Diff line change
Expand Up @@ -167,19 +167,18 @@ index 54939fb..15f928a 100644
#endif
for (ezInt32 i = 0; i < (ezInt32)trace.GetCount(); i++)
{
diff --git b/Code/Engine/ezBuildInfo.h b/Code/Engine/ezBuildInfo.h
diff --git a/Code/Engine/ezBuildInfo.h b/Code/Engine/ezBuildInfo.h
new file mode 100644
index 0000000..763271c
index 0000000..9ba9484
--- /dev/null
+++ b/Code/Engine/ezBuildInfo.h
@@ -0,0 +1,10 @@
@@ -0,0 +1,9 @@
+//
+// This file is auto-generated by CMake.
+//
+
+#pragma once
+
+#define EZ_GIT_COMMIT_HASH_SHORT
+#define EZ_GIT_COMMIT_HASH_LONG
+#define EZ_GIT_COMMIT_HASH_SHORT
+#define EZ_GIT_COMMIT_HASH_LONG
+#define EZ_GIT_BRANCH_NAME ""
+
48 changes: 26 additions & 22 deletions ports/ezfoundation/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,31 +1,35 @@
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ezEngine/ezEngine
REF 1448308ab99bae0d8d2a292ad345ff3a757f3124 #21.10
SHA512 20da87772366d1612795f534b31600123c0d04beba252d27d895c3c3cff7dae65952bd890629d79a7a691c2f3444601552c4b4eca99e8f8a99dc935ce2ebd284
PATCHES
ezFoundation_vcpkg.patch
OUT_SOURCE_PATH SOURCE_PATH
REPO ezEngine/ezEngine
REF 1448308ab99bae0d8d2a292ad345ff3a757f3124 #21.10
SHA512 20da87772366d1612795f534b31600123c0d04beba252d27d895c3c3cff7dae65952bd890629d79a7a691c2f3444601552c4b4eca99e8f8a99dc935ce2ebd284
PATCHES
ezfoundation-vcpkg.diff
# when making changes to this patch, use vim rather than VS Code or other editors that will
# normalize line endings because upstream's line endings are inconsistent which makes the
# patch get much larger than necessary
disable-warnings-as-errors.diff
)

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DEZ_3RDPARTY_ENET_SUPPORT=OFF
-DEZ_3RDPARTY_ZSTD_SUPPORT=OFF
-DEZ_3RDPARTY_ZLIB_SUPPORT=OFF
-DEZ_BUILD_FILTER=FoundationOnly
-DEZ_BUILD_UNITTESTS=OFF
-DEZ_ENABLE_FOLDER_UNITY_FILES=OFF
-DEZ_ENABLE_QT_SUPPORT=OFF
-DEZ_USE_PCH=OFF
OPTIONS_DEBUG
-DEZ_OUTPUT_DIRECTORY_LIB=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Output/Lib
-DEZ_OUTPUT_DIRECTORY_DLL=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Output/Bin
OPTIONS_RELEASE
-DEZ_OUTPUT_DIRECTORY_LIB=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Output/Lib
-DEZ_OUTPUT_DIRECTORY_DLL=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Output/Bin
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DEZ_3RDPARTY_ENET_SUPPORT=OFF
-DEZ_3RDPARTY_ZSTD_SUPPORT=OFF
-DEZ_3RDPARTY_ZLIB_SUPPORT=OFF
-DEZ_BUILD_FILTER=FoundationOnly
-DEZ_BUILD_UNITTESTS=OFF
-DEZ_ENABLE_FOLDER_UNITY_FILES=OFF
-DEZ_ENABLE_QT_SUPPORT=OFF
-DEZ_USE_PCH=OFF
OPTIONS_DEBUG
-DEZ_OUTPUT_DIRECTORY_LIB=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Output/Lib
-DEZ_OUTPUT_DIRECTORY_DLL=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Output/Bin
OPTIONS_RELEASE
-DEZ_OUTPUT_DIRECTORY_LIB=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Output/Lib
-DEZ_OUTPUT_DIRECTORY_DLL=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Output/Bin
)

vcpkg_cmake_build(TARGET Foundation)
Expand Down
1 change: 1 addition & 0 deletions ports/ezfoundation/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "ezfoundation",
"version": "21.10",
"port-version": 1,
"description": "Foundation library out of ezEngine",
"homepage": "https://ezengine.net/",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -2898,7 +2898,7 @@
},
"ezfoundation": {
"baseline": "21.10",
"port-version": 0
"port-version": 1
},
"f3d": {
"baseline": "3.2.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/e-/ezfoundation.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2d772ca62c751b0f5498a9857968b3366d3f5f67",
"version": "21.10",
"port-version": 1
},
{
"git-tree": "9db831cf3166d08f581365fccce852ae9aeb8b69",
"version": "21.10",
Expand Down