Switch to tinyfiledialogs, implement unicode on Windows

This commit is contained in:
Joshua Granick
2016-12-27 17:25:33 -08:00
parent 4956adc595
commit ec60520d52
7 changed files with 258 additions and 123 deletions

View File

@@ -16,7 +16,6 @@
<set name="LIME_HARFBUZZ" value="1" />
<set name="LIME_LZMA" value="1" />
<!-- <set name="LIME_NEKO" value="1" if="linux" /> -->
<set name="LIME_NFD" value="1" if="windows || mac" />
<set name="LIME_OGG" value="1" />
<set name="LIME_OPENALSOFT" value="1" if="windows || linux || android" unless="static_link" />
<set name="LIME_OPENAL" value="1" if="mac || iphone || emscripten || tvos" />
@@ -27,6 +26,7 @@
<set name="LIME_SDL" value="1" />
<!-- <set name="LIME_SDL_ANGLE" value="1" if="windows" unless="static_link" /> -->
<set name="LIME_SDL_ANGLE" value="1" if="windows LIME_SDL_ANGLE" unless="static_link" />
<set name="LIME_TINYFILEDIALOGS" value="1" if="windows || mac || linux" />
<set name="LIME_VORBIS" value="1" />
<set name="LIME_ZLIB" value="1" />
@@ -117,15 +117,6 @@
</section>
<section if="LIME_NFD">
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/nfd/src/include/" />
<compilerflag value="-DLIME_NFD" />
<file name="src/ui/FileDialog.cpp" />
</section>
<section if="LIME_OGG">
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/ogg/include/" />
@@ -206,6 +197,15 @@
</section>
<section if="LIME_TINYFILEDIALOGS">
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/tinyfiledialogs/" />
<compilerflag value="-DLIME_TINYFILEDIALOGS" />
<file name="src/ui/FileDialog.cpp" />
</section>
<section if="LIME_ZLIB">
<compilerflag value="-DSTATIC_LINK" if="emscripten" />
@@ -256,12 +256,12 @@
<include name="lib/jpeg/files.xml" />
<include name="lib/lzma/files.xml" />
<include name="lib/neko/files.xml" />
<include name="lib/nfd/files.xml" />
<include name="lib/ogg/files.xml" />
<include name="lib/openal/files.xml" />
<include name="lib/pixman/files.xml" />
<include name="lib/png/files.xml" />
<include name="lib/sdl/files.xml" />
<include name="lib/tinyfiledialogs/files.xml" />
<include name="lib/vorbis/files.xml" />
<include name="lib/zlib/files.xml" />
@@ -282,12 +282,12 @@
<files id="native-toolkit-harfbuzz" if="LIME_HARFBUZZ" />
<files id="native-toolkit-lzma" if="LIME_LZMA" />
<files id="native-toolkit-neko" if="LIME_NEKO" />
<files id="native-toolkit-nfd" if="LIME_NFD" />
<files id="native-toolkit-ogg" if="LIME_OGG" />
<files id="native-toolkit-openal" if="LIME_OPENALSOFT" />
<files id="native-toolkit-pixman" if="LIME_PIXMAN" />
<files id="native-toolkit-png" if="LIME_PNG" />
<files id="native-toolkit-sdl" if="LIME_SDL" unless="emscripten" />
<files id="native-toolkit-tinyfiledialogs" if="LIME_TINYFILEDIALOGS" />
<files id="native-toolkit-vorbis" if="LIME_VORBIS" />
<files id="native-toolkit-zlib" if="LIME_ZLIB" />