From 263c14e0ff78549608b08e665c5872558b148a4e Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Fri, 13 Apr 2018 19:30:13 -0500 Subject: [PATCH] [nostalgia] Cleanup --- .vscode/c_cpp_properties.json | 5 ++++- cmake/Modules/GBA.cmake | 10 +--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index efdbba3f..f6baa1df 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 27e84a96..abb11d5e 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} $) -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})