Restructured files, started refactoring main.cpp

Author: ChedRed

CMakeLists.txt

@@ -9,49 +9,66 @@ project(RePiskel)
 # Set CMake variables
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
-set(CMAKE_CXX_STANDARD 23)
+set(CMAKE_CXX_STANDARD 26)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 
 # Main executable
+string(APPEND CMAKE_CXX_FLAGS " -Wno-narrowing")
 if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-    add_executable(RePiskel MACOSX_BUNDLE main.cpp buildfiles/icon.icns)
-else(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    add_executable(RePiskel WIN32 main.cpp buildfiles/wicon.rc)
+    add_executable(RePiskel MACOSX_BUNDLE src/main.cpp buildfiles/icon.icns)
+elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+    add_executable(RePiskel src/main.cpp buildfiles/wicon.rc) # WIN32
+else(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    add_executable(RePiskel src/main.cpp)
 endif()
 
 
-target_compile_options(RePiskel PRIVATE -fpermissive)
-
-
 if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     # Set macos executable rpath and result path
     set_target_properties(RePiskel PROPERTIES INSTALL_RPATH "@executable_path/../Resources" BUILD_WITH_INSTALL_RPATH TRUE)
     set_target_properties(RePiskel PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/build)
 
 
     # Link libraries and include directories
-    target_link_libraries(RePiskel PRIVATE ${CMAKE_SOURCE_DIR}/../Cached/libSDL3.0.dylib)
-    target_link_libraries(RePiskel PRIVATE ${CMAKE_SOURCE_DIR}/../Cached/libSDL3_ttf.0.0.0.dylib)
-    # target_link_libraries(RePiskel PRIVATE ${CMAKE_SOURCE_DIR}/../Cached/libgtk-4.1.dylib)
-    target_include_directories(RePiskel PRIVATE /usr/local/include)
-
+    find_package(SDL3 REQUIRED CONFIG COMPONENTS SDL3-shared)
+    find_package(SDL3_ttf REQUIRED CONFIG COMPONENTS SDL3_ttf-shared)
+    target_link_libraries(RePiskel PRIVATE SDL3::SDL3)
+    target_link_libraries(RePiskel PRIVATE SDL3_ttf::SDL3_ttf)
 
     # Make directories for macos app
-    file(MAKE_DIRECTORY ${CMAKE_SOURCE_DIR}/build/RePiskel.app/Contents/MacOS)
-    file(MAKE_DIRECTORY ${CMAKE_SOURCE_DIR}/build/RePiskel.app/Contents/Resources)
+    file(MAKE_DIRECTORY "${CMAKE_SOURCE_DIR}/build/RePiskel.app/Contents/MacOS")
+    file(COPY "${CMAKE_SOURCE_DIR}/buildfiles/Resources" DESTINATION "${CMAKE_SOURCE_DIR}/build/RePiskel.app/Contents")
 
 
     # Add basic files to macos app
-    file(COPY ${CMAKE_SOURCE_DIR}/buildfiles/info.plist DESTINATION ${CMAKE_SOURCE_DIR}/build/RePiskel.app/Contents)
-    file(COPY ${CMAKE_SOURCE_DIR}/buildfiles/icon.icns DESTINATION ${CMAKE_SOURCE_DIR}/build/RePiskel.app/Contents/Resources)
-    file(COPY ${CMAKE_SOURCE_DIR}/buildfiles/Font.ttf DESTINATION ${CMAKE_SOURCE_DIR}/build/RePiskel.app/Contents/Resources)
-    file(COPY ${CMAKE_SOURCE_DIR}/buildfiles/tools.bmp DESTINATION ${CMAKE_SOURCE_DIR}/build/RePiskel.app/Contents/Resources)
+    file(COPY ${CMAKE_SOURCE_DIR}/buildfiles/info.plist DESTINATION "${CMAKE_SOURCE_DIR}/build/RePiskel.app/Contents")
+    file(COPY ${CMAKE_SOURCE_DIR}/buildfiles/icon.icns DESTINATION "${CMAKE_SOURCE_DIR}/build/RePiskel.app/Contents/Resources")
 
 
     # Add resources to macos app
-    file(COPY ${CMAKE_SOURCE_DIR}/../Cached/libSDL3.0.dylib DESTINATION ${CMAKE_SOURCE_DIR}/build/RePiskel.app/contents/Resources)
-    configure_file(${CMAKE_SOURCE_DIR}/../Cached/libSDL3_ttf.0.0.0.dylib ${CMAKE_SOURCE_DIR}/build/RePiskel.app/contents/Resources/libSDL3_ttf.0.dylib COPYONLY)
+    add_custom_command(TARGET CanvasView POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:SDL3::SDL3-shared> $<TARGET_FILE_DIR:CanvasView>/../Resources)
+    add_custom_command(TARGET CanvasView POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:SDL3_ttf::SDL3_ttf-shared> $<TARGET_FILE_DIR:CanvasView>/../Resources)
+    add_custom_command(TARGET CanvasView POST_BUILD COMMAND ${CMAKE_COMMAND} -E rename $<TARGET_FILE_DIR:CanvasView>/../Resources/libSDL3_ttf.0.0.0.dylib $<TARGET_FILE_DIR:CanvasView>/../Resources/libSDL3_ttf.0.dylib)
+
+
+elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    # Set linux result path
+    set_target_properties(RePiskel PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/build/RePiskel)
+    set_target_properties(RePiskel PROPERTIES INSTALL_RPATH "$ORIGIN/Resources" BUILD_WITH_INSTALL_RPATH TRUE)
+    find_package(SDL3 REQUIRED CONFIG COMPONENTS SDL3-shared)
+    find_package(SDL3_ttf REQUIRED CONFIG COMPONENTS SDL3_ttf-shared)
+    target_link_libraries(RePiskel PRIVATE SDL3::SDL3)
+    target_link_libraries(RePiskel PRIVATE SDL3_ttf::SDL3_ttf)
+
+    file(MAKE_DIRECTORY "${CMAKE_SOURCE_DIR}/build/RePiskel")
+    file(COPY "${CMAKE_SOURCE_DIR}/buildfiles/Resources" DESTINATION "${CMAKE_SOURCE_DIR}/build/RePiskel")
+
+    add_custom_command(TARGET RePiskel POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:SDL3::SDL3-shared> $<TARGET_FILE_DIR:RePiskel>/Resources)
+    add_custom_command(TARGET RePiskel POST_BUILD COMMAND ${CMAKE_COMMAND} -E rename $<TARGET_FILE_DIR:RePiskel>/Resources/libSDL3.so.0.2.5 $<TARGET_FILE_DIR:RePiskel>/Resources/libSDL3.so.0)
+    add_custom_command(TARGET RePiskel POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:SDL3_ttf::SDL3_ttf-shared> $<TARGET_FILE_DIR:RePiskel>/Resources)
+    add_custom_command(TARGET RePiskel POST_BUILD COMMAND ${CMAKE_COMMAND} -E rename $<TARGET_FILE_DIR:RePiskel>/Resources/libSDL3_ttf.so.0.1.2 $<TARGET_FILE_DIR:RePiskel>/Resources/libSDL3_ttf.so.0)
+
 
 
 else(CMAKE_SYSTEM_NAME STREQUAL "Windows")
@@ -66,8 +83,7 @@ else(CMAKE_SYSTEM_NAME STREQUAL "Windows")
 
 
     # Add basic files to windows app
-    file(COPY ${CMAKE_SOURCE_DIR}/buildfiles/tools.bmp DESTINATION ${CMAKE_SOURCE_DIR}/build/RePiskel)
-    file(COPY ${CMAKE_SOURCE_DIR}/buildfiles/Font.ttf DESTINATION ${CMAKE_SOURCE_DIR}/build/RePiskel)
+    file(COPY ${CMAKE_SOURCE_DIR}/buildfiles/Resources DESTINATION "${CMAKE_SOURCE_DIR}/build/RePiskel")
 
 
     # Add resources to windows app

Vector2.h

@@ -0,0 +1,60 @@
+#include <string>
+#include <vector>
+#include <SDL3/SDL.h>
+#define elif else if
+
+inline std::string SDL_GetBasePathNOS(){
+    std::string data = SDL_GetBasePath();
+    #ifdef _WIN32
+    std::string returnv;
+    for (int i = 0; i < data.length(); i++){
+        if (data[i] == '\\'){
+            returnv += "/";
+        }
+        else{
+            returnv += data[i];
+        }
+    }
+    return returnv;
+    #else
+    return data;
+    #endif
+}
+
+inline std::string ParsePath(std::string path) {
+    std::string returnv;
+
+
+    for (int i = 0; i < path.length(); i++) {
+        bool Append = true;
+        if (path[i] == '\\') {
+            returnv += "/";
+            Append = false;
+        } elif (path[i] == '~') {
+            returnv += SDL_GetBasePathNOS();
+            Append = false;
+        } elif (i > 0) {
+            if (std::string(path[i-1], path[i]) != "\\\\") {
+                Append = false;
+            }
+        }
+        returnv += path[i];
+    }
+
+    return returnv;
+}
+
+
+inline std::vector<std::string> SplitString(std::string str, char delimiter) {
+    std::vector<std::string> returnv;
+    std::string part;
+    for (int i = 0; i < str.length(); i++) {
+        if (str[i] == delimiter) {
+            returnv.push_back(part);
+            part.clear();
+        } else {
+            part += str[i];
+        }
+    }
+    return returnv;
+}