From f58dbf37eeb438f76d7a04f0de131bb4a3c59f2d Mon Sep 17 00:00:00 2001 From: Mathew Velasquez Date: Mon, 7 Sep 2015 13:04:08 -0400 Subject: [PATCH] removed all traces of INI_ENCODING --- mkxp.pro | 10 ---------- src/config.cpp | 8 -------- 2 files changed, 18 deletions(-) diff --git a/mkxp.pro b/mkxp.pro index ae4d614..9cae776 100644 --- a/mkxp.pro +++ b/mkxp.pro @@ -8,8 +8,6 @@ INCLUDEPATH += . src CONFIG(release, debug|release): DEFINES += NDEBUG -CONFIG -= INI_ENCODING - isEmpty(BINDING) { BINDING = MRI } @@ -60,10 +58,6 @@ unix { PKGCONFIG += fluidsynth } - INI_ENCODING { - PKGCONFIG += libguess - } - # Deal with boost paths... isEmpty(BOOST_I) { BOOST_I = $$(BOOST_I) @@ -262,10 +256,6 @@ SHARED_FLUID { DEFINES += SHARED_FLUID } -INI_ENCODING { - DEFINES += INI_ENCODING -} - defineReplace(xxdOutput) { return($$basename(1).xxd) } diff --git a/src/config.cpp b/src/config.cpp index 903d461..5f830c6 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -34,14 +34,6 @@ #include "util.h" #include "sdl-util.h" -#ifdef INI_ENCODING -extern "C" { -#include -} -#include -#include -#endif - /* http://stackoverflow.com/a/1031773 */ static bool validUtf8(const char *string) {