It builds again

5GameMaker · Sep 15, 2024 · 60813df · 60813df
1 parent dc145a4
commit 60813df
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 11 deletions.
diff --git a/freesprite/EditorLayerPicker.cpp b/freesprite/EditorLayerPicker.cpp
@@ -88,8 +88,8 @@ void EditorLayerPicker::render(XY position)
     //SDL_SetRenderDrawColor(g_rd, 0x30, 0x30, 0x30, focused ? 0x80 : 0x30);
     //SDL_RenderFillRect(g_rd, &r);
 
-    SDL_Color colorBG1 = { 0x30, 0x30, 0x30, focused ? 0xa0 : 0x90};
-    SDL_Color colorBG2 = { 0x10, 0x10, 0x10, focused ? 0xa0 : 0x90};
+    SDL_Color colorBG1 = { 0x30, 0x30, 0x30, uint8_t(focused ? 0xa0 : 0x90)};
+    SDL_Color colorBG2 = { 0x10, 0x10, 0x10, uint8_t(focused ? 0xa0 : 0x90)};
     renderGradient(r, sdlcolorToUint32(colorBG2), sdlcolorToUint32(colorBG1), sdlcolorToUint32(colorBG1), sdlcolorToUint32(colorBG1));
     if (focused) {
         SDL_SetRenderDrawColor(g_rd, 0xff, 0xff, 0xff, 255);

diff --git a/freesprite/FileIO.cpp b/freesprite/FileIO.cpp
@@ -13,6 +13,7 @@
 #include "pugixml/pugixml.hpp"
 #include "astc_dec/astc_decomp.h"
 #include "base64/base64.hpp"
+#include "MainEditorPalettized.h"
 #include <cstdio>
 
 enum VTFFORMAT
@@ -1931,7 +1932,7 @@ MainEditor* loadAnyIntoSession(std::string utf8path)
 #if _WIDEPATHS
     fPath = utf8StringToWstring(utf8path);
 #else
-    fPath = path;
+    fPath = utf8path;
 #endif
 
     for (FileSessionImportNPath importer : g_fileSessionImportersNPaths) {

diff --git a/freesprite/platform_linux.h b/freesprite/platform_linux.h
@@ -21,16 +21,16 @@ void platformPreInit() {
 
 }
 void platformInit() {
-	
+
 }
 void platformPostInit() {
-	
+
 }
 
 void platformTrySaveImageFile(EventCallbackListener* caller) {}
 void platformTryLoadImageFile(EventCallbackListener* caller) {}
 void platformTrySaveOtherFile(EventCallbackListener* caller, std::vector<std::pair<std::string,std::string>> filetypes, std::string windowTitle, int evt_id) {}
-void platformTryLoadOtherFile(EventCallbackListener* caller, std::string extension, std::string windowTitle) {}
+void platformTryLoadOtherFile(EventCallbackListener* listener, std::vector<std::pair<std::string, std::string>> filetypes, std::string windowTitle, int evt_id) {}
 
 void platformOpenFileLocation(PlatformNativePathString path) {}
 

diff --git a/linux-build/CMakeLists.txt b/linux-build/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10)
 project(freesprite)
 set(CMAKE_CXX_STANDARD 23)
 file(GLOB SRC ../freesprite/*.c* ../freesprite/**/*.c*)
-link_directories(${CMAKE_SOURCE_DIR}/lib)
+link_directories(${CMAKE_SOURCE_DIR}/../freesprite/imagecdylib/target/release/)
 add_executable(freesprite ${SRC})
 target_link_libraries(freesprite z)
 target_link_libraries(freesprite m)

diff --git a/linux-build/_voidsprite.sh b/linux-build/_voidsprite.sh
@@ -1,6 +1,12 @@
 #!/usr/bin/env sh
 
-D="$(dirname "$0")"
+SOURCE=${BASH_SOURCE[0]}
+while [ -L "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
+    DIR=$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )
+    SOURCE=$(readlink "$SOURCE")
+    [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
+done
+DIR=$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )
 
-LD_LIBRARY_PATH="$D/lib:$LD_LIBRARY_PATH" exec -a voidsprite "$D/__freesprite" $@
+LD_LIBRARY_PATH="$DIR/lib:$LD_LIBRARY_PATH" exec -a voidsprite "$DIR/__freesprite" $@
 
diff --git a/linux-build/build.sh b/linux-build/build.sh
@@ -1,9 +1,33 @@
 set -e
+
+SOURCE=${BASH_SOURCE[0]}
+while [ -L "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
+    DIR=$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )
+    SOURCE=$(readlink "$SOURCE")
+    [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
+done
+DIR=$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )
+
+echo ':: building imagecdylib ::'
+
+cd ../freesprite/imagecdylib
+cargo build --release
+cd "$DIR"
+
+echo ':: building voidsprite ::'
+
 cmake -G Ninja
 ninja
-mkdir -p dist
-cp -r lib dist/
+
+echo ':: packaging ::'
+
+mkdir -p dist/lib/
+
+cp ../freesprite/imagecdylib/target/release/lib* dist/lib/
+
 find ../freesprite \( -name "*.ico" -o -name "*.ttf" \) -exec cp {} dist/ \;
 cp -r ../freesprite/assets/ dist/
 cp freesprite dist/__freesprite
 cp _voidsprite.sh dist/voidsprite
+
+echo ':: done ::'