loader_aw

commit 83a2b1d3995f40c5cd6f33d596a58721d2757591
parent 839c8f2b8a70fd67e2b2c166218a58a4288a1c76
Author: vaplv <vaplv@free.fr>
Date:   Wed, 20 May 2015 11:32:23 +0200

Use the new RSys mem_allocator API

Diffstat:
M
cmake/CMakeLists.txt
 | 
4
++--
M
src/aw_mtl.c
 | 
2
+-
M
src/aw_obj.c
 | 
2
+-

3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -24,7 +24,7 @@ set(AW_SOURCE_DIR ${PROJECT_SOURCE_DIR}/../src)
 # Dependencies
 ################################################################################
 find_package(RCMake REQUIRED)
-find_package(RSys REQUIRED)
+find_package(RSys 0.2 REQUIRED)
 include_directories(${RCMake_INCLUDE_DIR} ${RSys_INCLUDE_DIR})
 
 set(CMAKE_MODULE_PATH ${RCMAKE_SOURCE_DIR})
@@ -43,7 +43,7 @@ target_link_libraries(aw RSys)
 
 set(VERSION_MAJOR 1)
 set(VERSION_MINOR 0)
-set(VERSION_PATCH 0)
+set(VERSION_PATCH 1)
 set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 set_target_properties(aw PROPERTIES
   DEFINE_SYMBOL AW_SHARED_BUILD
diff --git a/src/aw_mtl.c b/src/aw_mtl.c
@@ -372,7 +372,7 @@ mtl_release(ref_T* ref)
   struct aw_mtl* mtl = CONTAINER_OF(ref, struct aw_mtl, ref);
   ASSERT(ref);
   darray_material_release(&mtl->materials);
-  MEM_FREE(mtl->allocator, mtl);
+  MEM_RM(mtl->allocator, mtl);
 }
 
 /*******************************************************************************
diff --git a/src/aw_obj.c b/src/aw_obj.c
@@ -452,7 +452,7 @@ obj_release(ref_T* ref)
   darray_named_group_release(&obj->usemtls);
   darray_smooth_group_release(&obj->smooth_groups);
   darray_mtllib_release(&obj->mtllibs);
-  MEM_FREE(obj->allocator, obj);
+  MEM_RM(obj->allocator, obj);
 }
 
 /*******************************************************************************