Merge pull request #11 from aromadev/master

update from aromadev @160121
amarullz · Jan 21, 2016 · 8912a08 · 8912a08
2 parents fbb1746 + 5a3db66
commit 8912a08
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.8)
 
 # Project Config
-project(libaroma)
+project(libaroma C ASM)
 set(CMAKE_BUILD_TYPE Release)
 
 execute_process( COMMAND ${CMAKE_C_COMPILER} -dumpmachine OUTPUT_VARIABLE DUMP_MACHINE OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -218,9 +218,6 @@ if("${ARCHITECTURE}" STREQUAL "arm")
 	endif()
 endif()
 
-# asm
-set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_C_COMPILER> <FLAGS> <DEFINES> -fPIC -c -o <OBJECT> <SOURCE>")
-
 # sources
 file(GLOB AROMA_SRCS
 	${PROJECT_SOURCE_DIR}/src/contrib/platform/${LIBAROMA_PLATFORM_NAME}/*.c

diff --git a/libs/harfbuzz-ng/CMakeLists.txt b/libs/harfbuzz-ng/CMakeLists.txt
@@ -44,3 +44,9 @@ set_target_properties(harfbuzz PROPERTIES COMPILE_FLAGS "-DHB_NO_MT -DHAVE_OT -D
 # dependencies
 add_dependencies(harfbuzz freetype)
 target_link_libraries(harfbuzz freetype)
+
+if(NOT DEFINED ANDROID_NDK)
+	# non ndk add stdc++
+	target_link_libraries(harfbuzz stdc++)
+endif()
+
diff --git a/src/aroma/graph/jpeg.c b/src/aroma/graph/jpeg.c
@@ -238,7 +238,7 @@ byte libaroma_jpeg_draw(
     int dx, int dy, int dw, int dh,
     byte dither
     ) {
-  byte retval=0;
+  volatile byte retval=0;
   if (!stream) {
     return retval;
   }

diff --git a/src/aroma_internal.h b/src/aroma_internal.h
@@ -41,6 +41,6 @@
 #include <aroma_platform.h>
 #include "fallbacks.h"
 #include "aroma/graph/engine/engine_internal.h"
-#include "memory.h"
+#include "aroma_memory.h"
 
 #endif /* __libaroma_aroma_internal_h__ */
diff --git a/src/memory.h → src/aroma_memory.h b/src/memory.h → src/aroma_memory.h
@@ -14,15 +14,15 @@
  * limitations under the License.
  *______________________________________________________________________________
  *
- * Filename    : system.h
- * Description : system utilities
+ * Filename    : memory.h
+ * Description : memory utilities
  *
  * + This is part of libaroma, an embedded ui toolkit.
- * + 14/02/15 - Author(s): Ahmad Amarullah
+ * + 20/01/16 - Author(s): Ahmad Amarullah
  *
  */
-#ifndef __libaroma_aroma_h__
-  #error "Include <aroma.h> instead."
+#ifndef __libaroma_aroma_internal_h__
+  #error "Include <aroma_internal.h> instead."
 #endif
 #ifndef __libaroma_memory_h__
 #define __libaroma_memory_h__