Add memory allocation API with templated C++ delegates & minor fixups #1123

Closed
KitsuneAlex wants to merge 5 commits from main into main
3 changed files with 84 additions and 15 deletions
Showing only changes of commit 668986fda1 - Show all commits

View File

@@ -5,6 +5,7 @@
cmake_minimum_required(VERSION 3.4.1) cmake_minimum_required(VERSION 3.4.1)
project(yoga)
set(CMAKE_VERBOSE_MAKEFILE on) set(CMAKE_VERBOSE_MAKEFILE on)
add_compile_options( add_compile_options(
@@ -16,9 +17,9 @@ add_compile_options(
-Wall -Wall
-std=c++11) -std=c++11)
file(GLOB_RECURSE yogacore_SRC yoga/*.cpp) file(GLOB_RECURSE YOGA_SRC yoga/*.cpp)
add_library(yogacore STATIC ${yogacore_SRC}) add_library(${CMAKE_PROJECT_NAME} STATIC ${YOGA_SRC})
target_include_directories(yogacore PUBLIC .) target_include_directories(${CMAKE_PROJECT_NAME} PUBLIC .)
target_link_libraries(yogacore android log) target_link_libraries(${CMAKE_PROJECT_NAME} android log)
set_target_properties(yogacore PROPERTIES CXX_STANDARD 11) set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES CXX_STANDARD 11)

View File

@@ -11,7 +11,6 @@
#include <string.h> #include <string.h>
#include <algorithm> #include <algorithm>
#include <atomic> #include <atomic>
#include <malloc.h>
#include "Utils.h" #include "Utils.h"
#include "YGNode.h" #include "YGNode.h"
#include "YGNodePrint.h" #include "YGNodePrint.h"