diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index efdbba3f7..f6baa1df8 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -27,7 +27,10 @@
             },
             "macFrameworkPath": [
                 "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/System/Library/Frameworks"
-            ]
+            ],
+            "compilerPath": "/usr/bin/clang",
+            "cStandard": "c11",
+            "cppStandard": "c++17"
         },
         {
             "name": "Linux",
diff --git a/cmake/Modules/GBA.cmake b/cmake/Modules/GBA.cmake
index 27e84a962..abb11d5e8 100644
--- a/cmake/Modules/GBA.cmake
+++ b/cmake/Modules/GBA.cmake
@@ -19,18 +19,10 @@ set(CMAKE_FIND_LIBRARY_PREFIXES lib)
 set(CMAKE_FIND_LIBRARY_SUFFIXES .a)
 
 set(LINKER_FLAGS "-specs=gba.specs")
-add_definitions (
-	-DARM7
-)
-
-function(BuildStaticLib LIBNAME SRCFILES)
-	add_library(${LIBNAME} OBJECT ${SRCFILES})
-	set(OBJS ${OBJS} $<TARGET_OBJECTS:${LIBNAME}>)
-endfunction()
+add_definitions(-DARM7)
 
 include(FindPackageHandleStandardArgs)
 
-
 macro(OBJCOPY_FILE EXE_NAME)
 	set(FO ${CMAKE_CURRENT_BINARY_DIR}/${EXE_NAME}.bin)
 	set(FI ${CMAKE_CURRENT_BINARY_DIR}/${EXE_NAME})