diff --git a/CMakeLists.txt b/CMakeLists.txt index 922ac56f..4b18f26f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,23 +23,22 @@ include(cmake/absl.cmake) add_subdirectory(src/lib/abseil-cpp) include(cmake/openssl.cmake) - +set(Protobuf_PROTOC_EXECUTABLE "/Users/scawful/code/protobuf/bin/protoc") +set(Protobuf_INCLUDE_DIRS "/Users/scawful/code/protobuf/include/") set(PROTOBUF_INCLUDE_PATH ${CMAKE_CURRENT_BINARY_DIR} CACHE INTERNAL "Path to generated protobuf files.") include_directories(${PROTOBUF_INCLUDE_PATH}) # Video Libraries ------------------------------------------------------------- -set(Protobuf_PROTOC_EXECUTABLE "/Users/scawful/code/protobuf/bin/protoc") -set(Protobuf_INCLUDE_DIRS "/Users/scawful/code/protobuf/include/") find_package(PNG REQUIRED) find_package(OpenGL REQUIRED) find_package(GLEW REQUIRED) + +# SDL2 ------------------------------------------------------------------------ find_package(SDL2) +add_subdirectory(src/lib/SDL) -# Asar Assembly --------------------------------------------------------------- -# add_subdirectory(src/lib/asar/src) -# include(cmake/asar.cmake) - +# ImGui ----------------------------------------------------------------------- include(cmake/imgui.cmake) # Project Files diff --git a/src/lib/SDL b/src/lib/SDL index 2e9f5b59..324c0b76 160000 --- a/src/lib/SDL +++ b/src/lib/SDL @@ -1 +1 @@ -Subproject commit 2e9f5b5989c5140f47ce3ada603c1ae32d555f01 +Subproject commit 324c0b76a0111f0955063ac657617708208963ea diff --git a/src/lib/abseil-cpp b/src/lib/abseil-cpp index 59cba2b5..8c0b94e7 160000 --- a/src/lib/abseil-cpp +++ b/src/lib/abseil-cpp @@ -1 +1 @@ -Subproject commit 59cba2b50dd689010f338c63db95ca164f195798 +Subproject commit 8c0b94e793a66495e0b1f34a5eb26bd7dc672db0