Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-28 17:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update to make compilation work with NanoSVG as a Git subtree.

Browse source
This commit is contained in:
Leon Styhre 2021-06-07 21:56:13 +02:00
parent 062ac5197a
commit 4b1c7c7f0a
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -231,7 +231,7 @@ set(COMMON_INCLUDE_DIRS
${RAPIDJSON_INCLUDE_DIRS} ${RAPIDJSON_INCLUDE_DIRS}
${SDL2_INCLUDE_DIR} ${SDL2_INCLUDE_DIR}
${VLC_INCLUDE_DIR} ${VLC_INCLUDE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/external ${CMAKE_CURRENT_SOURCE_DIR}/external/nanosvg/src
${CMAKE_CURRENT_SOURCE_DIR}/es-core/src) ${CMAKE_CURRENT_SOURCE_DIR}/es-core/src)
# For Windows we need to add local include files for the dependency packages. # For Windows we need to add local include files for the dependency packages.
@ -292,8 +292,7 @@ if(NOT WIN32)
${FREETYPE_LIBRARIES} ${FREETYPE_LIBRARIES}
${PUGIXML_LIBRARIES} ${PUGIXML_LIBRARIES}
${SDL2_LIBRARY} ${SDL2_LIBRARY}
${VLC_LIBRARIES} ${VLC_LIBRARIES})
nanosvg)
elseif(WIN32) elseif(WIN32)
if(DEFINED MSVC) if(DEFINED MSVC)
set(COMMON_LIBRARIES set(COMMON_LIBRARIES
@ -311,7 +310,6 @@ elseif(WIN32)
"${PROJECT_SOURCE_DIR}/SDL2main.lib" "${PROJECT_SOURCE_DIR}/SDL2main.lib"
"${PROJECT_SOURCE_DIR}/libvlc.lib" "${PROJECT_SOURCE_DIR}/libvlc.lib"
"${PROJECT_SOURCE_DIR}/SDL2.lib" "${PROJECT_SOURCE_DIR}/SDL2.lib"
"nanosvg"
"Winmm.dll") "Winmm.dll")
else() else()
set(COMMON_LIBRARIES set(COMMON_LIBRARIES
@ -330,7 +328,6 @@ elseif(WIN32)
"${PROJECT_SOURCE_DIR}/libvlc.dll" "${PROJECT_SOURCE_DIR}/libvlc.dll"
"${PROJECT_SOURCE_DIR}/SDL2.dll" "${PROJECT_SOURCE_DIR}/SDL2.dll"
"mingw32" "mingw32"
"nanosvg"
"Winmm.dll") "Winmm.dll")
endif() endif()
endif() endif()
@ -388,6 +385,5 @@ set(EXECUTABLE_OUTPUT_PATH ${dir} CACHE PATH "Build directory" FORCE)
set(LIBRARY_OUTPUT_PATH ${dir} CACHE PATH "Build directory" FORCE) set(LIBRARY_OUTPUT_PATH ${dir} CACHE PATH "Build directory" FORCE)
# Add each component. # Add each component.
add_subdirectory("external")
add_subdirectory("es-core") add_subdirectory("es-core")
add_subdirectory("es-app") add_subdirectory("es-app")

8
es-core/src/resources/TextureData.cpp
View file

@ -6,6 +6,9 @@
// Low-level texture data functions. // Low-level texture data functions.
// //
#define NANOSVG_IMPLEMENTATION
#define NANOSVGRAST_IMPLEMENTATION
#include "resources/TextureData.h" #include "resources/TextureData.h"
#include "math/Misc.h" #include "math/Misc.h"
@ -14,9 +17,8 @@
#include "ImageIO.h" #include "ImageIO.h"
#include "Log.h" #include "Log.h"
#include <nanosvg/nanosvg.h> #include <nanosvg.h>
#include <nanosvg/nanosvgrast.h> #include <nanosvgrast.h>
#include <assert.h>
#include <string.h> #include <string.h>
#define DPI 96 #define DPI 96