0
@@ -1,16 +1,18 @@
0
+project(Rubinius C)
0
+
0
 if(CMAKE_SYSTEM_NAME MATCHES "Linux")
0
   # better cpu detection on Linux (lifted from cmake cvs)
0
   exec_program(${CMAKE_UNAME} ARGS -m OUTPUT_VARIABLE CMAKE_SYSTEM_PROCESSOR)
0
   set(LINUX 1)
0
 endif(CMAKE_SYSTEM_NAME MATCHES "Linux")
0
 
0
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
0
+if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
0
   set(DARWIN 1)
0
-endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
0
+endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
0
 
0
-if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL x86)
0
+if(CMAKE_SYSTEM_PROCESSOR STREQUAL x86)
0
   set(CMAKE_SYSTEM_PROCESSOR i386)
0
-endif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL x86)
0
+endif(CMAKE_SYSTEM_PROCESSOR STREQUAL x86)
0
 
0
 if(WIN32)
0
   if(MINGW)

0
@@ -1,6 +1,7 @@
0
 include(vars.cmake)
0
 message(STATUS "Configuring Rubinius version ${VERSION}")
0
 
0
+include(CheckCSourceCompiles)
0
 include(CheckIncludeFile)
0
 include(CheckFunctionExists)
0
 include(CheckLibraryExists)
0
@@ -78,6 +79,7 @@ endif(NOT MINGW)
0
 
0
 add_subdirectory(external_libs/libbstring)
0
 add_subdirectory(external_libs/libcchash)
0
+add_subdirectory(external_libs/libffi)
0
 add_subdirectory(external_libs/libev)
0
 add_subdirectory(external_libs/libltdl)
0
 add_subdirectory(external_libs/libmpa)

0
@@ -1 +0,0 @@
0
-*

0
@@ -17,9 +17,12 @@ set(lib_src
0
   sha1.c state.c string.c symbol.c tuple.c var_table.c)
0
 
0
 set(subtend_src
0
-  subtend/ffi.c subtend/handle.c subtend/library.c subtend/nmc.c
0
-  subtend/nmethod.c subtend/PortableUContext.c subtend/ruby.c subtend/setup.c
0
-  subtend/PortableUContext_asm.S)
0
+  subtend/ffi.c subtend/ffi_libffi.c subtend/handle.c subtend/library.c
0
+  subtend/nmc.c subtend/nmethod.c subtend/PortableUContext.c subtend/ruby.c
0
+  subtend/setup.c subtend/PortableUContext_asm.S)
0
+
0
+# this to enable .S compiling
0
+set_source_files_properties(subtend/PortableUContext_asm.S PROPERTIES LANGUAGE C)
0
 
0
 if(NOT HAVE_STRLCAT)
0
   set(strl_src ${strl_src} strlcat.c)
0
@@ -108,7 +111,7 @@ add_library(rubinius SHARED
0
   ${grammar_c})
0
 
0
 target_link_libraries(rubinius 
0
-  bstring cchash ev ltdl ptr_array mquark tommath zip onig)
0
+  bstring cchash ev ltdl ptr_array mquark tommath zip onig ffi)
0
 
0
 target_link_libraries(rubinius ${LIBDL} ${ZLIB_LIBRARY} m)
0