Skip to content

Commit 04e4eca

Browse files
authored
Use ghc::filesystem to handle paths (#119)
and assume strings as UTF8
1 parent c5b6e79 commit 04e4eca

File tree

18 files changed

+6420
-442
lines changed

18 files changed

+6420
-442
lines changed

.github/workflows/windows-binary.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
run: |
5858
cd subdir
5959
export LDFLAGS="-s -Wl,-no-undefined -Wl,-O1 -static"
60-
export CXXFLAGS="-O2 -march=${{matrix.arch}} -fomit-frame-pointer -pipe -DUNICODE"
60+
export CXXFLAGS="-O2 -march=${{matrix.arch}} -fomit-frame-pointer -pipe -D_UNICODE -DUNICODE"
6161
export PKG_CONFIG="pkg-config --static"
6262
tar -xf libsidplayfp*.tar.gz
6363
cd libsidplayfp*/.
@@ -72,7 +72,7 @@ jobs:
7272
- name: build
7373
run: |
7474
export LDFLAGS="-s -Wl,-no-undefined -Wl,-O1 -static"
75-
export CXXFLAGS="-O2 -march=${{matrix.arch}} -fomit-frame-pointer -pipe -DUNICODE"
75+
export CXXFLAGS="-O2 -march=${{matrix.arch}} -fomit-frame-pointer -pipe -D_UNICODE -DUNICODE"
7676
export PKG_CONFIG="pkg-config --static"
7777
autoreconf -vfi
7878
./configure --disable-dependency-tracking

Makefile.am

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ $(fmt_SOURCES) \
5757
libs/miniaudio/osaudio_miniaudio.c \
5858
libs/miniaudio/osaudio.h \
5959
libs/miniaudio/miniaudio.h \
60+
libs/filesystem/filesystem.hpp \
6061
src/IniConfig.cpp \
6162
src/IniConfig.h \
6263
src/args.cpp \
@@ -92,9 +93,7 @@ src/audio/null/null.h \
9293
src/audio/wav/WavFile.cpp \
9394
src/audio/wav/WavFile.h \
9495
src/ini/iniHandler.h \
95-
src/ini/iniHandler.cpp \
96-
src/ini/sidfstream.h \
97-
src/ini/types.h
96+
src/ini/iniHandler.cpp
9897

9998
src_sidplayfp_LDADD = \
10099
$(LIBICONV) \

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,7 @@ the character conversion requires presence of the POSIX/XSI iconv function famil
8181
* miniaudio
8282
https://github.com/mackron/miniaudio
8383
distributed under MIT license
84+
85+
* filesystem
86+
https://github.com/gulrak/filesystem
87+
distributed under MIT license

0 commit comments

Comments
 (0)