Skip to content
Open
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion extern/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required (VERSION 3.16)
add_subdirectory(zlib-1.2.11)

set(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/zlib-1.2.11 ${CMAKE_CURRENT_SOURCE_DIR}/zlib-1.2.11)
set(ZLIB_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/zlib-1.2.11/libz.a)
set(ZLIB_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/zlib-1.2.11/Debug/zlibstaticd.lib)

set(PNG_BUILD_ZLIB ON CACHE BOOL "" FORCE)
add_subdirectory(lpng1637)
Expand Down
2 changes: 1 addition & 1 deletion extern/png++/png++/error.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ namespace png
// return std::string(buf);

#undef ERRBUF_SIZE
}
return "uwu";}
};

} // namespace png
Expand Down
5 changes: 3 additions & 2 deletions extern/sfml/.github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ jobs:
runs-on: ${{ matrix.platform.os }}

strategy:
fail-fast: false
matrix:
platform:
- { name: Windows VS2017, os: windows-2016 }
Expand All @@ -34,7 +35,7 @@ jobs:

- name: Install Linux Dependencies
if: runner.os == 'Linux'
run: sudo apt-get install libxrandr-dev libxcursor-dev libudev-dev libopenal-dev libflac-dev libvorbis-dev libgl1-mesa-dev libegl1-mesa-dev
run: sudo apt-get update && sudo apt-get install libxrandr-dev libxcursor-dev libudev-dev libopenal-dev libflac-dev libvorbis-dev libgl1-mesa-dev libegl1-mesa-dev


- name: Install Android Components
Expand All @@ -43,7 +44,7 @@ jobs:
echo "y" | /usr/local/lib/android/sdk/tools/bin/sdkmanager --install "cmake;3.10.2.4988404" --sdk_root=ANDROID_SDK_ROOT
sudo ln -sf /usr/local/lib/android/sdk/cmake/3.10.2.4988404/bin/cmake /usr/bin/cmake
wget -nv https://dl.google.com/android/repository/android-ndk-r18b-linux-x86_64.zip -P $GITHUB_WORKSPACE
unzip -qq -d $GITHUB_WORKSPACE android-ndk-r18b-linux-x86_64.zip
unzip -qq -d $GITHUB_WORKSPACE android-ndk-r18b-linux-x86_64.zip


- name: Configure CMake
Expand Down
134 changes: 0 additions & 134 deletions extern/sfml/.travis.yml

This file was deleted.

26 changes: 13 additions & 13 deletions extern/sfml/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
# CMake's built-in Android support requires 3.7.0
if(CMAKE_SYSTEM_NAME MATCHES "Android")
cmake_minimum_required(VERSION 3.7.2)
else()
cmake_minimum_required(VERSION 3.0.2)
endif()
cmake_minimum_required(VERSION 3.7.2)

# define a macro that helps defining an option
macro(sfml_set_option var default type docstring)
Expand Down Expand Up @@ -77,7 +72,10 @@ endif()

# add options to select which modules to build
sfml_set_option(SFML_BUILD_WINDOW TRUE BOOL "TRUE to build SFML's Window module. This setting is ignored, if the graphics module is built.")
sfml_set_option(SFML_BUILD_GRAPHICS TRUE BOOL "TRUE to build SFML's gRAPHICS module.")
sfml_set_option(SFML_BUILD_GRAPHICS TRUE BOOL "TRUE to build SFML's Graphics module.")
sfml_set_option(SFML_BUILD_AUDIO TRUE BOOL "TRUE to build SFML's Audio module.")
sfml_set_option(SFML_BUILD_NETWORK TRUE BOOL "TRUE to build SFML's Network module.")

# add an option for building the API documentation
sfml_set_option(SFML_BUILD_DOC FALSE BOOL "TRUE to generate the API documentation, FALSE to ignore it")

Expand Down Expand Up @@ -146,7 +144,7 @@ endif()
# For miscellaneous files
if(SFML_OS_WINDOWS OR SFML_OS_IOS)
set(DEFAULT_INSTALL_MISC_DIR .)
elseif(SFML_OS_LINUX OR SFML_OS_FREEBSD OR SFML_OS_OPENBSD)
elseif(SFML_OS_LINUX OR SFML_OS_FREEBSD OR SFML_OS_OPENBSD OR SFML_OS_NETBSD)
set(DEFAULT_INSTALL_MISC_DIR share/SFML)
elseif(SFML_OS_MACOSX)
set(DEFAULT_INSTALL_MISC_DIR /usr/local/share/SFML)
Expand Down Expand Up @@ -255,10 +253,12 @@ if(SFML_OS_MACOSX)
endif()
endif()

# only the default architecture (i.e. 64-bit) is supported
if(NOT CMAKE_OSX_ARCHITECTURES STREQUAL "x86_64")
message(FATAL_ERROR "Only 64-bit architecture is supported")
endif()
# only the default x86_64 or arm64 are supported
foreach (arch IN LISTS CMAKE_OSX_ARCHITECTURES)
if (NOT (arch STREQUAL "x86_64" OR arch STREQUAL "arm64"))
message(FATAL_ERROR "Invalid arch ${arch}")
endif()
endforeach()

# configure Xcode templates
set(XCODE_TEMPLATES_ARCH "\$(NATIVE_ARCH_ACTUAL)")
Expand Down Expand Up @@ -288,7 +288,7 @@ endif()
# on Linux and BSD-like OS, install pkg-config files by default
set(SFML_INSTALL_PKGCONFIG_DEFAULT FALSE)

if(SFML_OS_LINUX OR SFML_OS_FREEBSD OR SFML_OS_OPENBSD)
if(SFML_OS_LINUX OR SFML_OS_FREEBSD OR SFML_OS_OPENBSD OR SFML_OS_NETBSD)
set(SFML_INSTALL_PKGCONFIG_DEFAULT TRUE)
endif()

Expand Down
6 changes: 5 additions & 1 deletion extern/sfml/cmake/Config.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "^OpenBSD$")
set(SFML_OS_OPENBSD 1)
# don't use the OpenGL ES implementation on OpenBSD
set(OPENGL_ES 0)
elseif(CMAKE_SYSTEM_NAME MATCHES "^NetBSD$")
set(SFML_OS_NETBSD 1)
# don't use the OpenGL ES implementation on NetBSD
set(OPENGL_ES 0)
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
if(IOS)
set(SFML_OS_IOS 1)
Expand Down Expand Up @@ -73,7 +77,7 @@ endif()
# this could be e.g. macports on mac or msys2 on windows etc.
set(SFML_PKGCONFIG_DIR "/${CMAKE_INSTALL_LIBDIR}/pkgconfig")

if(SFML_OS_FREEBSD OR SFML_OS_OPENBSD)
if(SFML_OS_FREEBSD OR SFML_OS_OPENBSD OR SFML_OS_NETBSD)
set(SFML_PKGCONFIG_DIR "/libdata/pkgconfig")
endif()

Expand Down
Loading