Fix FS include path in Nostalgia

This commit is contained in:
Gary Talent 2018-02-13 19:20:20 -06:00
parent d5b0bb69df
commit d3b8e6089b
8 changed files with 56 additions and 13 deletions

5
.vscode/.cmaketools.json vendored Normal file
View File

@ -0,0 +1,5 @@
{
"variant": null,
"activeEnvironments": [],
"codeModel": null
}

View File

@ -1,8 +1,12 @@
{ {
"files.associations": { "files.associations": {
"iostream": "cpp", "iostream": "cpp",
"ostream": "cpp" "ostream": "cpp",
"array": "cpp",
"initializer_list": "cpp",
"utility": "cpp"
}, },
"editor.insertSpaces": false, "editor.insertSpaces": false,
"editor.tabSize": 3 "editor.tabSize": 3,
"git.ignoreLimitWarning": true
} }

View File

@ -20,9 +20,15 @@ if(NOSTALGIA_BUILD_TYPE STREQUAL "GBA")
-fno-strict-aliasing -fno-strict-aliasing
-mthumb-interwork -mthumb-interwork
-mthumb -mthumb
-std=c++17
) )
else()
set(CMAKE_CXX_STANDARD 14)
endif() endif()
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
add_definitions( add_definitions(
#-fdiagnostics-color # forces colored output when using ninja #-fdiagnostics-color # forces colored output when using ninja
-Wall -Wall
@ -30,10 +36,6 @@ add_definitions(
) )
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
if(NOSTALGIA_IDE_BUILD STREQUAL "ON") if(NOSTALGIA_IDE_BUILD STREQUAL "ON")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})

View File

@ -1,10 +1,5 @@
set(CMAKE_SYSTEM_NAME "Generic") set(CMAKE_SYSTEM_NAME "Generic")
set(DEVKITARM $ENV{DEVKITARM}) set(DEVKITARM $ENV{DEVKITARM})
set(DEVKITPRO $ENV{DEVKITPRO})
if(NOT DEVKITPRO)
message(FATAL_ERROR "DEVKITPRO environment variable not set")
endif()
if(NOT DEVKITARM) if(NOT DEVKITARM)
message(FATAL_ERROR "DEVKITARM environment variable not set") message(FATAL_ERROR "DEVKITARM environment variable not set")

35
mg.yml Normal file
View File

@ -0,0 +1,35 @@
---
envs:
nostalgia_devenv:
dockerfile_path: ./Dockerfile
cmake:
.:
src_dir: .
build_dir: build/${target}-${build_type}
generator: Unix Makefiles
defs:
CMAKE_EXPORT_COMPILE_COMMANDS: ON
CMAKE_INSTALL_PREFIX: dist/${target}-${build_type}
CMAKE_INSTALL_RPATH: dist/${target}-${build_type}
NOSTALGIA_BUILD_TYPE: OFF
build_types:
release:
defs:
CMAKE_BUILD_TYPE: Release
debug:
defs:
USE_ASAN: ON
CMAKE_BUILD_TYPE: Debug
targets:
linux:
env: nostalgia_devenv
windows:
env: nostalgia_devenv
defs:
CMAKE_TOOLCHAIN_FILE: cmake/Modules/Mingw.cmake
gba:
env: nostalgia_devenv
defs:
CMAKE_TOOLCHAIN_FILE: cmake/Modules/GBA.cmake
NOSTALGIA_BUILD_TYPE: GBA
OX_USE_STDLIB: OFF

View File

@ -6,7 +6,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/ */
#include <ox/fs/filesystem.hpp> #include <ox/fs/fs.hpp>
#include <ox/std/std.hpp> #include <ox/std/std.hpp>
#include "../media.hpp" #include "../media.hpp"

View File

@ -6,7 +6,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/ */
#include <ox/fs/filesystem.hpp> #include <ox/fs/fs.hpp>
#include <ox/std/std.hpp> #include <ox/std/std.hpp>
#include "addresses.hpp" #include "addresses.hpp"

View File

@ -7,6 +7,7 @@
*/ */
#include <QDir> #include <QDir>
#include <QDebug>
#include "project.hpp" #include "project.hpp"
@ -28,6 +29,7 @@ Project::~Project() {
} }
void Project::create() { void Project::create() {
qDebug() << "Project::create";
QDir().mkpath(m_path); QDir().mkpath(m_path);
auto buffSize = 1024; auto buffSize = 1024;