屏蔽字体功能

Author: scarsty

smallpot.dll/smallpot.dll.vcxproj

@@ -103,7 +103,7 @@
     <TargetName>smallpot</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <TargetName>smallpotd</TargetName>
+    <TargetName>smallpot</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

src/Engine.cpp

@@ -4,10 +4,6 @@
 #include <windows.h>
 #pragma comment(lib, "user32.lib")
 #endif
-#include "ft2build.h"
-
-#include "freetype/freetype.h"
-#include "freetype/ftglyph.h"
 
 #if defined(_WIN32) && defined(WITH_SMALLPOT)
 #include "PotDll.h"
@@ -95,8 +91,9 @@ int Engine::init(void* handle /*= nullptr*/, int handle_type /*= 0*/, int maximi
     //logo_ = loadImage("logo.png");
     showLogo();
     renderPresent();
+#ifndef _WINDLL
     TTF_Init();
-
+#endif
 #ifdef _MSC_VER
     RECT r;
     SystemParametersInfo(SPI_GETWORKAREA, 0, (PVOID)&r, 0);
@@ -807,6 +804,7 @@ Texture* Engine::createRectTexture(int w, int h, int style) const
 
 Texture* Engine::createTextTexture(const std::string& fontname, const std::string& text, int size, Color c) const
 {
+#ifndef _WINDLL
     auto font = TTF_OpenFont(fontname.c_str(), size);
     if (!font)
     {
@@ -817,10 +815,13 @@ Texture* Engine::createTextTexture(const std::string& fontname, const std::strin
     SDL_DestroySurface(text_s);
     TTF_CloseFont(font);
     return text_t;
+#endif
+    return nullptr;
 }
 
 Texture* Engine::createTextTexture(const std::string& fontname, wchar_t text, int size, Color c) const
 {
+#ifndef _WINDLL
     FT_Library library{ nullptr };
     FT_Face face{ nullptr };
     FT_GlyphSlot slot{ nullptr };
@@ -880,6 +881,8 @@ Texture* Engine::createTextTexture(const std::string& fontname, wchar_t text, in
     SDL_DestroySurface(text_s);
     //TTF_CloseFont(font);
     return text_t;
+#endif
+    return nullptr;
 }
 
 int Engine::showMessage(const std::string& content) const

src/PotPlayer.cpp

@@ -600,13 +600,16 @@ int PotPlayer::eventLoop()
 
 int PotPlayer::init()
 {
+    int maximum = 0;
 #ifndef _WINDLL
     Config::getInstance().init(run_path_);
-    int maximum = Config::getInstance()["windows_maximized"];
+    maximum = Config::getInstance()["windows_maximized"];
+#endif
     if (engine_->init(handle_, handle_type_, maximum))
     {
         return -1;
     }
+#ifndef _WINDLL
 #ifdef _WIN32
     sys_encode_ = Config::getInstance().get("sys_encode", "cp936");
 #else
@@ -655,6 +658,8 @@ int PotPlayer::beginWithFile(std::string filename)
     }
     //首次运行拖拽的文件也认为是同一个
     drop_filename_ = Config::getInstance().findSuitableFilename(filename);
+#else
+    drop_filename_ = filename;
 #endif
     std::print("Begin with file: {}\n", filename);
     auto play_filename = drop_filename_;