Clean up build files. Now it can build with Ninja.

Author: iacore

libs/CMakeLists.txt

@@ -10,6 +10,13 @@ add_definitions("-DBUILDING_IOVMALL_DLL")
 # Output our static library to the top-level _build hierarchy
 set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/_build/lib)
 
+# Define the subdirectories we can reach from here that we want
+# to go into and build stuff.
+add_subdirectory(coroutine)
+add_subdirectory(basekit)
+add_subdirectory(garbagecollector)
+add_subdirectory(iovm)
+
 # Our Io source files to be "compiled" into a C source file.
 #file(GLOB IO_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/iovm/io/*.io")
 set(IO_SRCS
@@ -55,7 +62,8 @@ file(GLOB COROUTINE_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/coroutine/source/*.c")
 file(GLOB BASEKIT_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/basekit/source/*.c")
 file(GLOB GARBAGECOLLECTOR_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/garbagecollector/source/*.c")
 file(GLOB IOVM_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/iovm/source/*.c")
-list(APPEND IOVM_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../deps/parson/parson.c)
+
+list(APPEND IOVM_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../deps/parson/parson.c ${CMAKE_CURRENT_SOURCE_DIR}/iovm/source/IoVMInit.c)
 
 # Marvelous flags, likely compiler dependent.
 #add_definitions(-DBUILDING_IOVM_DLL)# -DINSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}")
@@ -68,14 +76,6 @@ set(IOVMALL_STATIC_SRCS
 	${IOVM_SRCS}
 )
 
-# The custom command to generate source/IoVMInit.c which is our
-# "compiled" Io to C source code.
-add_custom_command(
-	OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/iovm/source/IoVMInit.c
-	COMMAND ${PROJECT_BINARY_DIR}/_build/binaries/io2c VMCode IoState_doString_ ${IO_SRCS} > ${CMAKE_CURRENT_SOURCE_DIR}/iovm/source/IoVMInit.c
-	DEPENDS io2c
-)
-
 # Include dirs, -I flags and whatnot
 include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}/iovm/source
@@ -86,17 +86,7 @@ include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}/garbagecollector/source
 )
 
-# Add a file to our library sources.
-list(APPEND IOVMALL_STATIC_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/iovm/source/IoVMInit.c) # Because we generate it
-
 # ...And the static library. Refer to IOVMALL_STATIC_SRCS definition
 # up top.
 add_library(iovmall_static STATIC ${IOVMALL_STATIC_SRCS})
 add_dependencies(iovmall_static io2c basekit coroutine garbagecollector iovmall)
-
-# Define the subdirectories we can reach from here that we want
-# to go into and build stuff.
-add_subdirectory(coroutine)
-add_subdirectory(basekit)
-add_subdirectory(garbagecollector)
-add_subdirectory(iovm)

libs/iovm/source/IoSeq_mutable.c

@@ -12,13 +12,6 @@ character encoding
 */
 // metadoc Sequence category Core
 
-#pragma GCC diagnostic push
-
-// Suppresses incorrect warning from GCC about CTYPE never having value of -1
-#ifndef __MINGW64__
-#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare"
-#endif
-
 #include "IoSeq.h"
 #include "IoState.h"
 #include "IoCFunction.h"
@@ -1442,4 +1435,3 @@ IoSeqMutateNoArgNoResultOp(ceil)
 
     IoObject_addMethodTable_(self, methodTable);
 }
-#pragma GCC pop