Merge pull request #130 from GhostlyDark/remove_boost

Remove Boost dependency
mupen64plus · May 10, 2024 · 347b4e4 · 347b4e4
2 parents d900f21 + bd747ff
commit 347b4e4
Show file tree

Hide file tree

Showing 14 changed files with 483 additions and 71 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -44,8 +44,8 @@ jobs:
           echo "G_REV=$(git rev-parse --short HEAD)" >> "${GITHUB_ENV}"
           if [[ ${{ matrix.bits }} -eq 32 ]]; then sudo dpkg --add-architecture i386; fi
           sudo apt-get update
-          sudo apt-get -y install libgl1-mesa-dev libboost-filesystem-dev libboost-system-dev libpng-dev libsdl1.2-dev libsdl2-dev zlib1g-dev
-          if [[ ${{ matrix.bits }} -eq 32 ]]; then sudo apt-get --reinstall -y install gcc-multilib g++-multilib libc6 libc6-dev-i386 libatomic1:i386 libgcc-s1:i386 libgomp1:i386 libitm1:i386 libquadmath0:i386 libstdc++6:i386 libubsan1:i386 libgl1-mesa-dev:i386 libboost-filesystem-dev:i386 libboost-system-dev:i386 libpng-dev:i386 libsdl1.2-dev:i386 libsdl2-dev:i386 zlib1g-dev:i386; fi
+          sudo apt-get -y install libgl1-mesa-dev libpng-dev libsdl1.2-dev libsdl2-dev zlib1g-dev
+          if [[ ${{ matrix.bits }} -eq 32 ]]; then sudo apt-get --reinstall -y install gcc-multilib g++-multilib libc6 libc6-dev-i386 libatomic1:i386 libgcc-s1:i386 libgomp1:i386 libitm1:i386 libquadmath0:i386 libstdc++6:i386 libubsan1:i386 libgl1-mesa-dev:i386 libpng-dev:i386 libsdl1.2-dev:i386 libsdl2-dev:i386 zlib1g-dev:i386; fi
           sudo ldconfig
       - name: Build and related stuff, backup binaries
         run: |
@@ -117,7 +117,6 @@ jobs:
             make
             mingw-w64-${{ matrix.cross }}-gcc
             mingw-w64-${{ matrix.cross }}-toolchain
-            mingw-w64-${{ matrix.cross }}-boost
             mingw-w64-${{ matrix.cross }}-glew
             mingw-w64-${{ matrix.cross }}-libpng
             mingw-w64-${{ matrix.cross }}-SDL2
@@ -149,7 +148,7 @@ jobs:
       - name: Backup dependencies, etc...
         run: |
           if [[ ${{ matrix.bits }} -eq 32 ]]; then LIBGCC="libgcc_s_dw2-1"; else LIBGCC="libgcc_s_seh-1"; fi
-          for LIB in glew32 libboost_filesystem-mt ${LIBGCC} libpng16-16 libstdc++-6 libwinpthread-1 SDL2 zlib1; do
+          for LIB in glew32 ${LIBGCC} libpng16-16 libstdc++-6 libwinpthread-1 SDL2 zlib1; do
             echo ":: Copying ${LIB}.dll"
             cp "/mingw${{ matrix.bits }}/bin/${LIB}.dll" pkg/
           done

diff --git a/.travis.yml b/.travis.yml
@@ -10,8 +10,6 @@ addons:
     - git
     - libsdl1.2-dev
     - libsdl2-dev
-    - libboost-filesystem-dev
-    - libboost-system-dev
     - libgl1-mesa-dev
     - libpng-dev
     - pkg-config
@@ -43,7 +41,6 @@ matrix:
       - sudo apt-get update -qq
       - sudo apt-get -y --allow-unauthenticated install mxe-i686-w64-mingw32.shared-gcc
       - sudo apt-get -y --allow-unauthenticated install mxe-i686-w64-mingw32.shared-sdl2
-      - sudo apt-get -y --allow-unauthenticated install mxe-i686-w64-mingw32.shared-boost
       - sudo apt-get -y --allow-unauthenticated install mxe-i686-w64-mingw32.shared-pthreads
       - sudo apt-get -y --allow-unauthenticated install mxe-i686-w64-mingw32.shared-zlib
       - sudo apt-get -y --allow-unauthenticated install mxe-i686-w64-mingw32.shared-libpng
@@ -63,7 +60,6 @@ matrix:
       - sudo apt-get update -qq
       - sudo apt-get -y --allow-unauthenticated install mxe-x86-64-w64-mingw32.shared-gcc
       - sudo apt-get -y --allow-unauthenticated install mxe-x86-64-w64-mingw32.shared-sdl2
-      - sudo apt-get -y --allow-unauthenticated install mxe-x86-64-w64-mingw32.shared-boost
       - sudo apt-get -y --allow-unauthenticated install mxe-x86-64-w64-mingw32.shared-pthreads
       - sudo apt-get -y --allow-unauthenticated install mxe-x86-64-w64-mingw32.shared-zlib
       - sudo apt-get -y --allow-unauthenticated install mxe-x86-64-w64-mingw32.shared-libpng

diff --git a/projects/msvc/mupen64plus-video-glide64mk2.vcxproj b/projects/msvc/mupen64plus-video-glide64mk2.vcxproj
@@ -75,66 +75,68 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\Glide64;..\..\src\Glide64\inc;..\..\src\GlideHQ;..\..\src\GlideHQ\tc-1.1+;..\..\src\Glitch64;..\..\src\Glitch64\inc;..\..\..\mupen64plus-core\src\api;..\..\..\mupen64plus-win32-deps\boost-1.81.0\;..\..\..\mupen64plus-win32-deps\SDL2-2.26.3\include;..\..\..\mupen64plus-win32-deps\zlib-1.2.13\include;..\..\..\mupen64plus-win32-deps\libpng-1.6.39\include;..\..\..\mupen64plus-win32-deps\opengl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\src\Glide64;..\..\src\Glide64\inc;..\..\src\GlideHQ;..\..\src\GlideHQ\tc-1.1+;..\..\src\Glitch64;..\..\src\Glitch64\inc;..\..\..\mupen64plus-core\src\api;..\..\..\mupen64plus-win32-deps\SDL2-2.26.3\include;..\..\..\mupen64plus-win32-deps\zlib-1.2.13\include;..\..\..\mupen64plus-win32-deps\libpng-1.6.39\include;..\..\..\mupen64plus-win32-deps\opengl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_VARIADIC_MAX=10;_CRT_SECURE_NO_WARNINGS;__MSC__;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
       <AdditionalDependencies>opengl32.lib;glu32.lib;SDL2.lib;libpng16.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\mupen64plus-win32-deps\boost-1.81.0\lib32-msvc;..\..\..\mupen64plus-win32-deps\libpng-1.6.39\lib\x86;..\..\..\mupen64plus-win32-deps\zlib-1.2.13\lib\x86;..\..\..\mupen64plus-win32-deps\SDL2-2.26.3\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\mupen64plus-win32-deps\libpng-1.6.39\lib\x86;..\..\..\mupen64plus-win32-deps\zlib-1.2.13\lib\x86;..\..\..\mupen64plus-win32-deps\SDL2-2.26.3\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\Glide64;..\..\src\Glide64\inc;..\..\src\GlideHQ;..\..\src\GlideHQ\tc-1.1+;..\..\src\Glitch64;..\..\src\Glitch64\inc;..\..\..\mupen64plus-core\src\api;..\..\..\mupen64plus-win32-deps\boost-1.81.0\;..\..\..\mupen64plus-win32-deps\SDL2-2.26.3\include;..\..\..\mupen64plus-win32-deps\zlib-1.2.13\include;..\..\..\mupen64plus-win32-deps\libpng-1.6.39\include;..\..\..\mupen64plus-win32-deps\opengl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\src\Glide64;..\..\src\Glide64\inc;..\..\src\GlideHQ;..\..\src\GlideHQ\tc-1.1+;..\..\src\Glitch64;..\..\src\Glitch64\inc;..\..\..\mupen64plus-core\src\api;..\..\..\mupen64plus-win32-deps\SDL2-2.26.3\include;..\..\..\mupen64plus-win32-deps\zlib-1.2.13\include;..\..\..\mupen64plus-win32-deps\libpng-1.6.39\include;..\..\..\mupen64plus-win32-deps\opengl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_VARIADIC_MAX=10;_CRT_SECURE_NO_WARNINGS;__MSC__;WIN32;NO_ASM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
       <AdditionalDependencies>opengl32.lib;glu32.lib;SDL2.lib;libpng16.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\mupen64plus-win32-deps\boost-1.81.0\lib64-msvc;..\..\..\mupen64plus-win32-deps\libpng-1.6.39\lib\x64;..\..\..\mupen64plus-win32-deps\zlib-1.2.13\lib\x64;..\..\..\mupen64plus-win32-deps\SDL2-2.26.3\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\mupen64plus-win32-deps\libpng-1.6.39\lib\x64;..\..\..\mupen64plus-win32-deps\zlib-1.2.13\lib\x64;..\..\..\mupen64plus-win32-deps\SDL2-2.26.3\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\src\Glide64;..\..\src\Glide64\inc;..\..\src\GlideHQ;..\..\src\GlideHQ\tc-1.1+;..\..\src\Glitch64;..\..\src\Glitch64\inc;..\..\..\mupen64plus-core\src\api;..\..\..\mupen64plus-win32-deps\boost-1.81.0\;..\..\..\mupen64plus-win32-deps\SDL2-2.26.3\include;..\..\..\mupen64plus-win32-deps\zlib-1.2.13\include;..\..\..\mupen64plus-win32-deps\libpng-1.6.39\include;..\..\..\mupen64plus-win32-deps\opengl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\src\Glide64;..\..\src\Glide64\inc;..\..\src\GlideHQ;..\..\src\GlideHQ\tc-1.1+;..\..\src\Glitch64;..\..\src\Glitch64\inc;..\..\..\mupen64plus-core\src\api;..\..\..\mupen64plus-win32-deps\SDL2-2.26.3\include;..\..\..\mupen64plus-win32-deps\zlib-1.2.13\include;..\..\..\mupen64plus-win32-deps\libpng-1.6.39\include;..\..\..\mupen64plus-win32-deps\opengl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_VARIADIC_MAX=10;_CRT_SECURE_NO_WARNINGS;__MSC__;WIN32;__VISUALC__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <AdditionalDependencies>opengl32.lib;glu32.lib;SDL2.lib;libpng16.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\mupen64plus-win32-deps\boost-1.81.0\lib32-msvc;..\..\..\mupen64plus-win32-deps\libpng-1.6.39\lib\x86;..\..\..\mupen64plus-win32-deps\zlib-1.2.13\lib\x86;..\..\..\mupen64plus-win32-deps\SDL2-2.26.3\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\mupen64plus-win32-deps\libpng-1.6.39\lib\x86;..\..\..\mupen64plus-win32-deps\zlib-1.2.13\lib\x86;..\..\..\mupen64plus-win32-deps\SDL2-2.26.3\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <SubSystem>Windows</SubSystem>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\src\Glide64;..\..\src\Glide64\inc;..\..\src\GlideHQ;..\..\src\GlideHQ\tc-1.1+;..\..\src\Glitch64;..\..\src\Glitch64\inc;..\..\..\mupen64plus-core\src\api;..\..\..\mupen64plus-win32-deps\boost-1.81.0\;..\..\..\mupen64plus-win32-deps\SDL2-2.26.3\include;..\..\..\mupen64plus-win32-deps\zlib-1.2.13\include;..\..\..\mupen64plus-win32-deps\libpng-1.6.39\include;..\..\..\mupen64plus-win32-deps\opengl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\src\Glide64;..\..\src\Glide64\inc;..\..\src\GlideHQ;..\..\src\GlideHQ\tc-1.1+;..\..\src\Glitch64;..\..\src\Glitch64\inc;..\..\..\mupen64plus-core\src\api;..\..\..\mupen64plus-win32-deps\SDL2-2.26.3\include;..\..\..\mupen64plus-win32-deps\zlib-1.2.13\include;..\..\..\mupen64plus-win32-deps\libpng-1.6.39\include;..\..\..\mupen64plus-win32-deps\opengl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_VARIADIC_MAX=10;_CRT_SECURE_NO_WARNINGS;__MSC__;WIN32;__VISUALC__;NO_ASM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <AdditionalDependencies>opengl32.lib;glu32.lib;SDL2.lib;libpng16.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\mupen64plus-win32-deps\boost-1.81.0\lib64-msvc;..\..\..\mupen64plus-win32-deps\libpng-1.6.39\lib\x64;..\..\..\mupen64plus-win32-deps\zlib-1.2.13\lib\x64;..\..\..\mupen64plus-win32-deps\SDL2-2.26.3\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\mupen64plus-win32-deps\libpng-1.6.39\lib\x64;..\..\..\mupen64plus-win32-deps\zlib-1.2.13\lib\x64;..\..\..\mupen64plus-win32-deps\SDL2-2.26.3\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <SubSystem>Windows</SubSystem>
@@ -157,6 +159,7 @@
     <ClCompile Include="..\..\src\Glide64\TexCache.cpp" />
     <ClCompile Include="..\..\src\Glide64\Util.cpp" />
     <ClCompile Include="..\..\src\GlideHQ\Ext_TxFilter.cpp" />
+    <ClCompile Include="..\..\src\GlideHQ\osal_files_win32.c" />
     <ClCompile Include="..\..\src\GlideHQ\tc-1.1+\fxt1.c" />
     <ClCompile Include="..\..\src\GlideHQ\tc-1.1+\s2tc\s2tc_algorithm.cpp" />
     <ClCompile Include="..\..\src\GlideHQ\tc-1.1+\s2tc\s2tc_libtxc_dxtn.cpp" />

diff --git a/projects/msvc/mupen64plus-video-glide64mk2.vcxproj.filters b/projects/msvc/mupen64plus-video-glide64mk2.vcxproj.filters
@@ -19,6 +19,9 @@
     <Filter Include="GlideHQ\tc-1.1+\s2tc">
       <UniqueIdentifier>{2cc583d4-7f35-421e-93d1-42b27587c3de}</UniqueIdentifier>
     </Filter>
+    <Filter Include="GlideHQ\Windows">
+      <UniqueIdentifier>{09258efe-2a3d-4c7c-825f-c2c0881048f0}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\GlideHQ\TextureFilters_hq4x.cpp">
@@ -138,6 +141,9 @@
     <ClCompile Include="..\..\src\GlideHQ\tc-1.1+\s2tc\s2tc_libtxc_dxtn.cpp">
       <Filter>GlideHQ\tc-1.1+\s2tc</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\GlideHQ\osal_files_win32.c">
+      <Filter>GlideHQ\Windows</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\GlideHQ\tc-1.1+\s2tc\s2tc_algorithm.h">

diff --git a/projects/unix/Makefile b/projects/unix/Makefile
@@ -44,7 +44,6 @@ ifeq ("$(UNAME)","Darwin")
   OS = OSX
   SO_EXTENSION = dylib
   SHARED = -bundle
-  BOOST_SUFFIX = -mt
 endif
 ifeq ("$(UNAME)","FreeBSD")
   OS = FREEBSD
@@ -66,7 +65,6 @@ ifeq ("$(patsubst MINGW%,MINGW,$(UNAME))","MINGW")
   SO_EXTENSION = dll
   SHARED = -shared
   PIC = 0
-  BOOST_SUFFIX = -mt
   CPPFLAGS += -DNO_FILTER_THREAD
 endif
 ifeq ("$(OS)","NONE")
@@ -154,9 +152,8 @@ OBJDIR = _obj$(POSTFIX)
 OPTFLAGS ?= -O3 -flto
 WARNFLAGS ?= -Wall -Wno-unused-function
 CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -ffast-math -fno-strict-aliasing -fvisibility=hidden -I$(SRCDIR) -I$(SRCDIR)/Glitch64/inc -DGCC
-CXXFLAGS += -fvisibility-inlines-hidden -std=gnu++0x
+CXXFLAGS += -fvisibility-inlines-hidden -std=gnu++17
 LDFLAGS += $(SHARED)
-BOOST_SUFFIX ?=
 
 ifeq ($(CPU), X86)
   CFLAGS +=  -mmmx -msse
@@ -440,7 +437,6 @@ SOURCE += \
 	$(SRCDIR)/GlideHQ/tc-1.1+/texstore.c
 
 CPPFLAGS += -DTEXTURE_FILTER -DDUMP_CACHE
-LDLIBS += -lboost_filesystem$(BOOST_SUFFIX) -lboost_system$(BOOST_SUFFIX)
 
   ifeq ($(TXCDXTN), 1)
     CPPFLAGS += -DTXCDXTN_EXTERNAL
@@ -452,9 +448,13 @@ LDLIBS += -lboost_filesystem$(BOOST_SUFFIX) -lboost_system$(BOOST_SUFFIX)
 endif
 
 ifeq ($(OS),MINGW)
-SOURCE += $(SRCDIR)/Glide64/osal_dynamiclib_win32.c
+SOURCE += \
+	$(SRCDIR)/Glide64/osal_dynamiclib_win32.c \
+	$(SRCDIR)/GlideHQ/osal_files_win32.c
 else
-SOURCE += $(SRCDIR)/Glide64/osal_dynamiclib_unix.c
+SOURCE += \
+	$(SRCDIR)/Glide64/osal_dynamiclib_unix.c \
+	$(SRCDIR)/GlideHQ/osal_files_unix.c
 endif
 
 

diff --git a/src/GlideHQ/TxCache.cpp b/src/GlideHQ/TxCache.cpp
@@ -25,12 +25,13 @@
 #pragma warning(disable: 4786)
 #endif
 
-#include <boost/filesystem.hpp>
+#include <filesystem>
 #include <zlib.h>
 #include "TxCache.h"
 #include "TxDbg.h"
 #include "../Glide64/m64p.h"
 #include "../Glide64/Gfx_1.3.h"
+#include "osal_files.h"
 
 TxCache::~TxCache()
 {
@@ -237,11 +238,11 @@ TxCache::save(const wchar_t *path, const wchar_t *filename, int config)
     /* dump cache to disk */
     char cbuf[MAX_PATH];
 
-    boost::filesystem::wpath cachepath(path);
-    boost::filesystem::create_directory(cachepath);
+    std::filesystem::path cachepath(path);
+    osal_mkdirp(cachepath.wstring().c_str());
 
     /* Ugly hack to enable fopen/gzopen in Win9x */
-#ifdef BOOST_WINDOWS_API
+#ifdef _WIN32
     wchar_t curpath[MAX_PATH];
     GETCWD(MAX_PATH, curpath);
     CHDIR(cachepath.wstring().c_str());
@@ -330,9 +331,9 @@ TxCache::load(const wchar_t *path, const wchar_t *filename, int config)
   /* find it on disk */
   char cbuf[MAX_PATH];
 
-  boost::filesystem::wpath cachepath(path);
+  std::filesystem::path cachepath(path);
 
-#ifdef BOOST_WINDOWS_API
+#ifdef _WIN32
   wchar_t curpath[MAX_PATH];
   GETCWD(MAX_PATH, curpath);
   CHDIR(cachepath.wstring().c_str());

diff --git a/src/GlideHQ/TxFilter.cpp b/src/GlideHQ/TxFilter.cpp
@@ -36,6 +36,8 @@
 #define swprintf _snwprintf
 #endif
 
+#include "osal_files.h"
+
 typedef struct {
     uint32 *src;
     uint32 srcwidth;
@@ -658,18 +660,18 @@ TxFilter::dmptx(uint8 *src, int width, int height, int rowStridePixel, uint16 gf
 
     /* create directories */
     tmpbuf.assign(_datapath + L"/texture_dump");
-    if (!boost::filesystem::exists(tmpbuf) &&
-        !boost::filesystem::create_directory(tmpbuf))
+    if (!osal_path_existsW(tmpbuf.c_str()) &&
+        !osal_mkdirp(tmpbuf.c_str()))
       return 0;
 
     tmpbuf.append(L"/" + _ident);
-    if (!boost::filesystem::exists(tmpbuf) &&
-        !boost::filesystem::create_directory(tmpbuf))
+    if (!osal_path_existsW(tmpbuf.c_str()) &&
+        !osal_mkdirp(tmpbuf.c_str()))
       return 0;
 
     tmpbuf.append(L"/GlideHQ");
-    if (!boost::filesystem::exists(tmpbuf) &&
-        !boost::filesystem::create_directory(tmpbuf))
+    if (!osal_path_existsW(tmpbuf.c_str()) &&
+        !osal_mkdirp(tmpbuf.c_str()))
       return 0;
 
     if ((n64fmt >> 8) == 0x2) {