Compare commits

..

No commits in common. "38d17dd0801f922b1311b822d2243eb528af9725" and "3dcbd2e9032867a0aa1961a1016790dd61d424a0" have entirely different histories.

2 changed files with 1 additions and 27 deletions

View File

@ -3,7 +3,7 @@ project(gles-compatibility-layer)
# Build
add_library(gles-compatibility-layer STATIC src/state.c src/passthrough.c src/matrix.c src/draw.c)
target_link_libraries(gles-compatibility-layer m)
target_link_libraries(gles-compatibility-layer m SDL)
target_include_directories(gles-compatibility-layer PUBLIC include)
# Shaders
include(cmake/util.cmake)
@ -11,23 +11,3 @@ embed_resource(gles-compatibility-layer src/shaders/main.vsh)
embed_resource(gles-compatibility-layer src/shaders/main.fsh)
# Warnings
target_compile_options(gles-compatibility-layer PRIVATE -Wall -Wextra -Werror -Wpointer-arith -Wshadow -Wnull-dereference)
# GLFW/SDL
option(GLES_COMPATIBILITY_LAYER_USE_SDL "Use SDL" TRUE)
if(GLES_COMPATIBILITY_LAYER_USE_SDL)
target_compile_definitions(gles-compatibility-layer PUBLIC GLES_COMPATIBILITY_LAYER_USE_SDL)
endif()
# Dependencies
set(GLES_COMPATIBILITY_LAYER_DEPENDENCY "" CACHE STRING "Compatibility Layer Dependency")
if(NOT GLES_COMPATIBILITY_LAYER_DEPENDENCY)
if(gles-compatibility-layer)
find_package(SDL2 REQUIRED)
target_link_libraries(gles-compatibility-layer SDL2::SDL2)
else()
find_package(glfw3 3.3 REQUIRED)
target_link_libraries(gles-compatibility-layer glfw)
endif()
else()
target_link_libraries(gles-compatibility-layer "${GLES_COMPATIBILITY_LAYER_DEPENDENCY}")
endif()

View File

@ -1,10 +1,4 @@
#ifdef GLES_COMPATIBILITY_LAYER_USE_SDL
#include <SDL.h>
#else
#define GLFW_INCLUDE_NONE
#include <GLFW/glfw3.h>
#define SDL_GL_GetProcAddress glfwGetProcAddress
#endif
#include "log.h"