cmake support win32 ,and support generate&use prebuilt libs

CMakeLists.txt

@@ -38,15 +38,13 @@ set(CMAKE_MODULE_PATH ${COCOS2DX_ROOT_PATH}/cmake/Modules/)
 include(CocosBuildSet)
 CocosBuildSet()
 
-# TODO: use cocos prebuilt library
-if(USE_COCOS_PREBUILT_LIBS)
-    # use prebuilt library, not build
-else(USE_COCOS_PREBUILT_LIBS)
-    # build engine library
-    add_subdirectory(${COCOS2DX_ROOT_PATH}/cocos ${ENGINE_BINARY_PATH}/cocos/core)
-
-    # build engine all tests project
-    add_subdirectory(${COCOS2DX_ROOT_PATH}/tests ${ENGINE_BINARY_PATH}/tests)
+# default tests include lua, js test project, so we set those option on to build libs
+set(BUILD_LUA_LIBS ON)
+set(BUILD_JS_LIBS ON)
+set(USE_SIMULATOR ON)
 
-endif(USE_COCOS_PREBUILT_LIBS)
+if(NOT USE_COCOS_PREBUILT)
+    add_subdirectory(${COCOS2DX_ROOT_PATH}/cocos ${ENGINE_BINARY_PATH}/cocos/core)
+endif()
+add_subdirectory(${COCOS2DX_ROOT_PATH}/tests ${ENGINE_BINARY_PATH}/tests)
 

cmake/AndroidNdkModules.cmake

@@ -32,6 +32,11 @@ macro(android_ndk_import_module_cpufeatures)
         include_directories(${ANDROID_NDK}/sources/android/cpufeatures)      
         add_library(cpufeatures ${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c)
         target_link_libraries(cpufeatures dl)
+        set_target_properties(cpufeatures
+            PROPERTIES
+            ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
+            LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
+        )
     endif()
 endmacro()