青天有月来几时？我今停杯一问之

增加android的条件编译，主要是头文件目录
scarsty · Jul 13, 2024 · 2f66e09 · 2f66e09
1 parent 604d8be
commit 2f66e09
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 20 deletions.
diff --git a/mlcc b/mlcc
diff --git a/src/Engine.h b/src/Engine.h
@@ -1,8 +1,14 @@
 #pragma once
 
+#ifndef __ANDROID__
 #include "SDL2/SDL.h"
 #include "SDL2/SDL_image.h"
 #include "SDL2/SDL_ttf.h"
+#else
+#include "SDL.h"
+#include "SDL_image.h"
+#include "SDL_ttf.h"
+#endif
 
 #include <algorithm>
 #include <chrono>

diff --git a/src/GameUtil.h b/src/GameUtil.h
@@ -27,7 +27,11 @@ class GameUtil : public INIReaderNormal
 
     static std::string& PATH()
     {
+#ifndef __ANDROID__
         static std::string s = "../game/";
+#else
+        static std::string s = "/sdcard/game/";
+#endif
         return s;
     }
 

diff --git a/src/OpenCCConverter.h b/src/OpenCCConverter.h
@@ -1,5 +1,9 @@
 #pragma once
+#ifndef __ANDROID__
 #include "opencc/opencc.h"
+#else
+#include "opencc.h"
+#endif
 
 class OpenCCConverter
 {

diff --git a/src/Script.h b/src/Script.h
@@ -3,8 +3,12 @@
 #ifdef _WIN32
 #include "lua.hpp"
 #else
+#ifdef __ANDROID__
+#include "lua.hpp"
+#else
 #include "lua5.4/lua.hpp"
 #endif
+#endif
 #include <array>
 #include <string>
 #include <type_traits>

diff --git a/src/ZipFile.cpp b/src/ZipFile.cpp
@@ -1,4 +1,5 @@
 #include "ZipFile.h"
+#include "../others/zip.h"
 #include <cstring>
 
 ZipFile::ZipFile()

diff --git a/src/ZipFile.h b/src/ZipFile.h
@@ -1,8 +1,9 @@
 #pragma once
-#include "../others/zip.h"
 #include <string>
 #include <vector>
 
+struct zip_t;
+
 class ZipFile
 {
 public:

diff --git a/src/kys.vcxproj.filters b/src/kys.vcxproj.filters
@@ -52,9 +52,6 @@
     <ClCompile Include="Button.cpp">
       <Filter>ui</Filter>
     </ClCompile>
-    <ClCompile Include="TextureManager.cpp">
-      <Filter>engine</Filter>
-    </ClCompile>
     <ClCompile Include="Cloud.cpp">
       <Filter>scene</Filter>
     </ClCompile>
@@ -106,9 +103,6 @@
     <ClCompile Include="ParticleExample.cpp">
       <Filter>particle</Filter>
     </ClCompile>
-    <ClCompile Include="Point.cpp">
-      <Filter>util</Filter>
-    </ClCompile>
     <ClCompile Include="InputBox.cpp">
       <Filter>ui</Filter>
     </ClCompile>
@@ -121,9 +115,6 @@
     <ClCompile Include="DrawableOnCall.cpp">
       <Filter>ui</Filter>
     </ClCompile>
-    <ClCompile Include="OpenCCConverter.cpp">
-      <Filter>util</Filter>
-    </ClCompile>
     <ClCompile Include="BattleNetwork.cpp">
       <Filter>battle</Filter>
     </ClCompile>
@@ -187,6 +178,15 @@
     <ClCompile Include="VirtualStick.cpp">
       <Filter>VirtualStick</Filter>
     </ClCompile>
+    <ClCompile Include="OpenCCConverter.cpp">
+      <Filter>opencc</Filter>
+    </ClCompile>
+    <ClCompile Include="Point.cpp">
+      <Filter>point</Filter>
+    </ClCompile>
+    <ClCompile Include="TextureManager.cpp">
+      <Filter>texture</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="BattleCursor.h">
@@ -276,9 +276,6 @@
     <ClInclude Include="TeamMenu.h">
       <Filter>ui</Filter>
     </ClInclude>
-    <ClInclude Include="TextureManager.h">
-      <Filter>engine</Filter>
-    </ClInclude>
     <ClInclude Include="Talk.h">
       <Filter>event</Filter>
     </ClInclude>
@@ -291,9 +288,6 @@
     <ClInclude Include="ParticleExample.h">
       <Filter>particle</Filter>
     </ClInclude>
-    <ClInclude Include="Point.h">
-      <Filter>util</Filter>
-    </ClInclude>
     <ClInclude Include="Application.h">
       <Filter>application</Filter>
     </ClInclude>
@@ -309,9 +303,6 @@
     <ClInclude Include="DrawableOnCall.h">
       <Filter>ui</Filter>
     </ClInclude>
-    <ClInclude Include="OpenCCConverter.h">
-      <Filter>util</Filter>
-    </ClInclude>
     <ClInclude Include="BattleNetwork.h">
       <Filter>battle</Filter>
     </ClInclude>
@@ -390,6 +381,15 @@
     <ClInclude Include="VirtualStick.h">
       <Filter>VirtualStick</Filter>
     </ClInclude>
+    <ClInclude Include="OpenCCConverter.h">
+      <Filter>opencc</Filter>
+    </ClInclude>
+    <ClInclude Include="Point.h">
+      <Filter>point</Filter>
+    </ClInclude>
+    <ClInclude Include="TextureManager.h">
+      <Filter>texture</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="_Resources">
@@ -448,6 +448,15 @@
     <Filter Include="VirtualStick">
       <UniqueIdentifier>{c64953ab-6bc5-432f-98db-3bc7d331e2a6}</UniqueIdentifier>
     </Filter>
+    <Filter Include="point">
+      <UniqueIdentifier>{b22155ca-ee9e-42e3-8eef-d2d74109b5c4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="opencc">
+      <UniqueIdentifier>{60baaf93-f283-418c-a2f9-7f415e49ecf8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="texture">
+      <UniqueIdentifier>{3f5f1c37-008d-4f8b-ae4e-a958437e52cf}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <Text Include="CMakeLists.txt" />