linux fixes

CMakeLists.txt

@@ -7,7 +7,7 @@ if (EMSCRIPTEN)
 		${CMAKE_CURRENT_SOURCE_DIR}/src)
 
 	set(OXYGINE_FREETYPE_CXX_FLAGS "-s USE_FREETYPE=1")
-	
+
 elseif(MSVC)
 	set(OXYGINE_FREETYPE_INCLUDE_DIRS 
 		${CMAKE_CURRENT_SOURCE_DIR}/src
@@ -16,7 +16,15 @@ elseif(MSVC)
 	set(OXYGINE_FREETYPE_LIBS
 		${CMAKE_CURRENT_SOURCE_DIR}/freetype/win32/freetype.lib)
 else()
-	set(OXYGINE_FREETYPE_LIBS freetype)
+	find_package(Freetype REQUIRED)
+
+	set(OXYGINE_FREETYPE_INCLUDE_DIRS 
+                ${CMAKE_CURRENT_SOURCE_DIR}/src)
+
+	set(OXYGINE_FREETYPE_LIBS ${FREETYPE_LIBRARIES})
+	include_directories(${FREETYPE_INCLUDE_DIRS})
+
+
 endif(EMSCRIPTEN)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
@@ -27,7 +35,6 @@ add_library(oxygine-freetype STATIC
 	src/ResFontFT.h
 )
 
-#target_link_libraries(oxyginemagicparticles)
 
 set(OXYGINE_FREETYPE_INCLUDE_DIRS ${OXYGINE_FREETYPE_INCLUDE_DIRS} PARENT_SCOPE)
 set(OXYGINE_FREETYPE_LIBS ${OXYGINE_FREETYPE_LIBS} PARENT_SCOPE)

examples/HelloFreeType/proj.cmake/CMakeLists.txt

@@ -13,7 +13,7 @@ link_directories(${OXYGINE_FREETYPE_LIBRARY_DIRS})
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OXYGINE_CXX_FLAGS} ${OXYGINE_FREETYPE_CXX_FLAGS}")
 
 add_executable(HelloFreeType ../src/main.cpp ../src/example.cpp  ../src/example.h  ../src/test.h   ../src/test.cpp )
-target_link_libraries(HelloFreeType ${OXYGINE_CORE_LIBS} ${OXYGINE_FREETYPE_LIBS} oxygine-freetype)
+target_link_libraries(HelloFreeType ${OXYGINE_CORE_LIBS} oxygine-freetype  ${OXYGINE_FREETYPE_LIBS})
 
 
 
@@ -27,4 +27,4 @@ if (EMSCRIPTEN)
 	SET(CMAKE_EXECUTABLE_SUFFIX ".html")	
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s NO_EXIT_RUNTIME=1 -s WARN_ON_UNDEFINED_SYMBOLS=1 --memory-init-file 0 -s TOTAL_MEMORY=50331648 -s FORCE_FILESYSTEM=1")
 	em_link_pre_js(HelloFreeType  ${OXYGINE_JS_LIBRARIES}  ${CMAKE_CURRENT_SOURCE_DIR}/data.js)
-endif(EMSCRIPTEN)
+endif(EMSCRIPTEN)