linux 适配

Author: SHIINASAMA

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.28.1)
+cmake_minimum_required(VERSION 3.13)
 
 project(jvm)
 
@@ -7,6 +7,12 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 if (MSVC)
     add_compile_options(/utf-8)
+    if (VCPKG_TARGET_TRIPLET STREQUAL "x64-windows-static")
+        set(CMAKE_CXX_FLAGS_DEBUG /MTd)
+        set(CMAKE_CXX_FLAGS_MINSIZEREL /MT)
+        set(CMAKE_CXX_FLAGS_RELEASE /MT)
+        set(CMAKE_CXX_FLAGS_RELWITHDEBUGINFO /MT)
+    endif ()
 endif ()
 
 include_directories(src)

src/jvm/Class.h

@@ -61,7 +61,7 @@ namespace jvm {
                 tag = float_info;
             }
 
-            float_t bytes{};
+            float bytes{};
         };
 
         struct ConstantInfo_Long final : ConstantInfo {
@@ -77,7 +77,7 @@ namespace jvm {
                 tag = double_info;
             }
 
-            double_t bytes{};
+            double bytes{};
         };
 
         struct ConstantInfo_Class final : ConstantInfo {

src/jvm/Runtime.cc

@@ -5,6 +5,8 @@
 #include <sese/util/Endian.h>
 #include <sese/util/Exception.h>
 
+#include <cmath>
+
 void jvm::Runtime::regClass(const std::shared_ptr<Class> &class_) {
     classes[class_->getThisName()] = class_;
     if (main.class_ == nullptr) {

src/jvm/Runtime.h

@@ -30,10 +30,12 @@ namespace jvm {
 
         void run(Info &prev, Info &current);
 
-        static struct MethodRefResult {
+        
+        struct MethodRefResult {
             std::string class_name;
             std::string method_id;
-        } getMethodRefResult(const std::shared_ptr<Class> &class_, uint16_t index);
+        };
+        static MethodRefResult getMethodRefResult(const std::shared_ptr<Class> &class_, uint16_t index);
 
 
         std::unordered_map<std::string, std::shared_ptr<Class> > classes;

src/jvm/Type.cc

@@ -4,11 +4,12 @@
 #include <sese/text/StringBuilder.h>
 
 #include <cassert>
+#include <algorithm>
 
 void jvm::TypeInfo::parse(std::string raw_name) {
     assert(!raw_name.empty());
     // 计算 raw_name 中 [ 的个数
-    is_array = std::count(raw_name.begin(), raw_name.end(), '[');
+    is_array = static_cast<uint8_t>(std::count(raw_name.begin(), raw_name.end(), '['));
     if (is_array) {
         raw_name = raw_name.substr(is_array, raw_name.length() - is_array);
     }

src/jvm/Type.h

@@ -1,6 +1,8 @@
 #pragma once
 
 #include <string>
+#include <cstdint>
+
 
 namespace jvm {
     enum Type : char {