From 3f337239e4ff9fff3c5b01503632d447ee0f5630 Mon Sep 17 00:00:00 2001
From: Mike Nolan <tesses@tesses.net>
Date: Sun, 26 Jan 2025 09:22:10 -0600
Subject: [PATCH] Fix code for loadlibrary on windows and fix code for certain
 platforms

---
 Config.cmake.in              | 7 -------
 src/crosslangdump.cpp        | 4 ++--
 src/crosslanginterperter.cpp | 4 ++--
 src/runtime_methods/std.cpp  | 6 +++---
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/Config.cmake.in b/Config.cmake.in
index 3db5823..d1bdee9 100644
--- a/Config.cmake.in
+++ b/Config.cmake.in
@@ -4,12 +4,5 @@ include("${CMAKE_CURRENT_LIST_DIR}/TessesCrossLangTargets.cmake")
 
 check_required_components(TessesCrossLang)
 find_package(TessesFramework REQUIRED)
-if(@CROSSLANG_ENABLE_SDL2@)
-find_package(SDL2 REQUIRED)
-find_package(SDL2_ttf REQUIRED)
-if("${CMAKE_SYSTEM_NAME}" STREQUAL "NintendoWii" OR "${CMAKE_SYSTEM_NAME}" STREQUAL "NintendoGameCube")
 
-else()
-find_package(SDL2_image REQUIRED)
-endif()
 endif()
\ No newline at end of file
diff --git a/src/crosslangdump.cpp b/src/crosslangdump.cpp
index fc7b7f3..188e9d2 100644
--- a/src/crosslangdump.cpp
+++ b/src/crosslangdump.cpp
@@ -132,7 +132,7 @@ void DumpFile(std::filesystem::path p)
 
             for(size_t i = 1; i < closures.size(); i++)
             {
-                if(funs.contains((uint32_t)i))
+                if(funs.count((uint32_t)i) > 0)
                 {
                     std::cout << "Func: ";
                     auto res = funs[(uint32_t)i];
@@ -183,4 +183,4 @@ int main(int argc, char** argv)
     {
         DumpFile(argv[i]);
     }
-}
\ No newline at end of file
+}
diff --git a/src/crosslanginterperter.cpp b/src/crosslanginterperter.cpp
index d26853b..f45a641 100644
--- a/src/crosslanginterperter.cpp
+++ b/src/crosslanginterperter.cpp
@@ -66,7 +66,7 @@ int main(int argc, char** argv)
 
             Tesses::Framework::Streams::MemoryStream strm2(true);
 
-            if(source.starts_with("loadfile "))
+            if(source.find("loadfile ") == 0)
             {
                 std::string filename = source.substr(9);
 
@@ -121,4 +121,4 @@ int main(int argc, char** argv)
     
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/runtime_methods/std.cpp b/src/runtime_methods/std.cpp
index 632692b..2cd351f 100644
--- a/src/runtime_methods/std.cpp
+++ b/src/runtime_methods/std.cpp
@@ -26,7 +26,7 @@ namespace Tesses::CrossLang
             T Resolve(std::string name)
             {
                 #if defined(_WIN32)
-                return (T)GetProcAddress(handle,name.c_str());
+                return (T)GetProcAddress((HMODULE)handle,name.c_str());
                 #else
                 return (T)dlsym(handle,name.c_str());
                 
@@ -35,7 +35,7 @@ namespace Tesses::CrossLang
             ~DL()
             {
                 #if defined(_WIN32)
-                FreeLibrary(handle);
+                FreeLibrary((HMODULE)handle);
                 #else
                 dlclose(handle);
                 #endif
@@ -425,4 +425,4 @@ namespace Tesses::CrossLang
         gc->BarrierEnd();
         env->permissions.locked=true;
     }
-}
\ No newline at end of file
+}