From de7cc1f12273ae80f4d972b0dbfc48066f851684 Mon Sep 17 00:00:00 2001 From: Stephen Enders <84310577289916ceefd4132143fb36b63a5f0c71> Date: Fri, 24 Jun 2022 21:35:03 -0400 Subject: Fix compilation for Windows I left a few changes undone in the Windows API. This should be cross platform now --- src/main.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 7de3c11..4ebb8e6 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -52,20 +52,21 @@ int main(int argc, char **argv) { #ifdef __linux__ Resources *res = new LinuxResources(); - res->loadDefaultLuaFile(); - res->loadFontFiles(); - res->loadLevels(); #endif // __linux__ #ifdef _WIN32 Resources *res = new WindowsResources(); #endif + res->loadDefaultLuaFile(); + res->loadFontFiles(); + res->loadLevels(); int levelIndex = 0; std::cout << "Select level from list: " << std::endl; int i = 0; for (auto &p : res->getLevels()) { - std::cout << "\t[" << i++ << "] " << p.parent_path().filename().c_str() - << "/" << p.filename().c_str() << std::endl; + std::cout << "\t[" << i++ << "] " + << p.parent_path().filename().generic_string() << "/" + << p.filename().generic_string() << std::endl; } std::cout << "Enter Number: "; std::cin >> levelIndex; -- cgit v1.2.3-54-g00ecf