mirror of
https://github.com/cmosher01/Epple-II.git
synced 2024-09-27 07:54:58 +00:00
fix windows build; slight refactor
This commit is contained in:
parent
6ce62c6bc2
commit
65369d5758
@ -128,12 +128,13 @@ void Config::parse(MemoryRandomAccess& ram, Memory& rom, Slots& slts, int& revis
|
|||||||
user_config = wxT("epple2");
|
user_config = wxT("epple2");
|
||||||
}
|
}
|
||||||
user_config += ".conf";
|
user_config += ".conf";
|
||||||
|
const std::filesystem::path user_path{user_config.fn_str().data()};
|
||||||
|
|
||||||
path = wxGetApp().GetConfigDir() / user_config.fn_str().data();
|
path = wxGetApp().GetConfigDir() / user_path;
|
||||||
std::cout << "looking for config file: " << path << std::endl;
|
std::cout << "looking for config file: " << path << std::endl;
|
||||||
pConfig = new std::ifstream(path.c_str());
|
pConfig = new std::ifstream(path.c_str());
|
||||||
if (!pConfig->is_open()) {
|
if (!pConfig->is_open()) {
|
||||||
path = wxGetApp().GetResDir() / user_config.fn_str().data();
|
path = wxGetApp().GetResDir() / user_path;
|
||||||
std::cout << "looking for config file: " << path << std::endl;
|
std::cout << "looking for config file: " << path << std::endl;
|
||||||
pConfig = new std::ifstream(path.c_str());
|
pConfig = new std::ifstream(path.c_str());
|
||||||
if (!pConfig->is_open()) {
|
if (!pConfig->is_open()) {
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
#ifndef WOZFILE_H
|
#ifndef WOZFILE_H
|
||||||
#define WOZFILE_H
|
#define WOZFILE_H
|
||||||
|
|
||||||
|
#include <filesystem>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
|
|
||||||
@ -45,7 +46,7 @@ static const std::uint8_t C_QTRACK(160);
|
|||||||
* rather, that information is known by the stepper motor and arm.
|
* rather, that information is known by the stepper motor and arm.
|
||||||
*/
|
*/
|
||||||
class WozFile {
|
class WozFile {
|
||||||
std::string filePath;
|
std::filesystem::path filePath;
|
||||||
bool loaded;
|
bool loaded;
|
||||||
bool modified;
|
bool modified;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user