浏览代码

minor fix for VC

dmuratshin 9 年之前
父节点
当前提交
336ca46126
共有 2 个文件被更改,包括 4 次插入3 次删除
  1. 3 2
      CMakeLists.txt
  2. 1 1
      examples/HelloFreeType/proj.cmake/CMakeLists.txt

+ 3 - 2
CMakeLists.txt

@@ -10,14 +10,15 @@ if (EMSCRIPTEN)
 
 
 	set(OXYGINEMAGICPARTICLES_LIBS
 	set(OXYGINEMAGICPARTICLES_LIBS
 		${CMAKE_CURRENT_SOURCE_DIR}/magic_particles/emscripten/libmagic.a)
 		${CMAKE_CURRENT_SOURCE_DIR}/magic_particles/emscripten/libmagic.a)
-
-else(EMSCRIPTEN)
+elseif(MSVC)
 	set(OXYGINE_FREETYPE_INCLUDE_DIRS 
 	set(OXYGINE_FREETYPE_INCLUDE_DIRS 
 		${CMAKE_CURRENT_SOURCE_DIR}/src
 		${CMAKE_CURRENT_SOURCE_DIR}/src
 		${CMAKE_CURRENT_SOURCE_DIR}/freetype/win32/include)
 		${CMAKE_CURRENT_SOURCE_DIR}/freetype/win32/include)
 
 
 	set(OXYGINE_FREETYPE_LIBS
 	set(OXYGINE_FREETYPE_LIBS
 		${CMAKE_CURRENT_SOURCE_DIR}/freetype/win32/freetype.lib)
 		${CMAKE_CURRENT_SOURCE_DIR}/freetype/win32/freetype.lib)
+else()
+	set(OXYGINE_FREETYPE_LIBS freetype)
 endif(EMSCRIPTEN)
 endif(EMSCRIPTEN)
 
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")

+ 1 - 1
examples/HelloFreeType/proj.cmake/CMakeLists.txt

@@ -17,4 +17,4 @@ if (WIN32) #disable console mode for VC++
 	set_target_properties(HelloFreeType PROPERTIES WIN32_EXECUTABLE TRUE)
 	set_target_properties(HelloFreeType PROPERTIES WIN32_EXECUTABLE TRUE)
 endif(WIN32)
 endif(WIN32)
 
 
-target_link_libraries(HelloFreeType ${OXYGINE_CORE_LIBS} ${OXYGINE_FREETYPE_LIBS} oxygine-freetype freetype)
+target_link_libraries(HelloFreeType ${OXYGINE_CORE_LIBS} ${OXYGINE_FREETYPE_LIBS} oxygine-freetype)