Browse Source

Remove freetype dependency

master
Riyyi 4 years ago
parent
commit
de477e8d38
  1. 3
      .gitmodules
  2. 6
      CMakeLists.txt
  3. 1
      README.org
  4. 1
      inferno/vendor/freetype

3
.gitmodules vendored

@ -10,6 +10,3 @@
[submodule "inferno/vendor/stb"]
path = inferno/vendor/stb
url = https://github.com/nothings/stb
[submodule "inferno/vendor/freetype"]
path = inferno/vendor/freetype
url = https://github.com/aseprite/freetype2

6
CMakeLists.txt

@ -46,7 +46,6 @@ endif()
# Include all headers
include_directories(
"${ENGINE}/vendor/freetype/include"
"${ENGINE}/vendor/glad/include"
"${ENGINE}/vendor/glfw/include"
"${ENGINE}/vendor/glm"
@ -77,11 +76,8 @@ set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
# Add GLFW target to project
add_subdirectory(${ENGINE}/vendor/glfw)
# Add FreeType2 target to project
add_subdirectory(${ENGINE}/vendor/freetype)
add_library(${ENGINE} STATIC ${ENGINE_SOURCES})
target_link_libraries(${ENGINE} glfw freetype)
target_link_libraries(${ENGINE} glfw)
# ------------------------------------------

1
README.org

@ -35,7 +35,6 @@ Or
* Libraries
# - [[https://github.com/bulletphysics/bullet3][Bullet]]
- [[https://github.com/aseprite/freetype2][FreeType2]]
- [[https://github.com/Dav1dde/glad][glad]]
- [[https://github.com/glfw/glfw][GLFW]]
- [[https://github.com/g-truc/glm][GLM]]

1
inferno/vendor/freetype vendored

@ -1 +0,0 @@
Subproject commit fbbcf50367403a6316a013b51690071198962920
Loading…
Cancel
Save