MapleShrine/mkxp
1
0
Fork 0
Code Issues 32 Pull requests 11 Projects Releases Wiki Activity

removed all traces of INI_ENCODING

Browse source
This commit is contained in:
Mathew Velasquez 2015-09-07 13:04:08 -04:00
parent ead39083d1
commit f58dbf37ee
2 changed files with 0 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

10
mkxp.pro
View file

@ -8,8 +8,6 @@ INCLUDEPATH += . src
CONFIG(release, debug|release): DEFINES += NDEBUG CONFIG(release, debug|release): DEFINES += NDEBUG
CONFIG -= INI_ENCODING
isEmpty(BINDING) { isEmpty(BINDING) {
BINDING = MRI BINDING = MRI
} }
@ -60,10 +58,6 @@ unix {
PKGCONFIG += fluidsynth PKGCONFIG += fluidsynth
} }
INI_ENCODING {
PKGCONFIG += libguess
}
# Deal with boost paths... # Deal with boost paths...
isEmpty(BOOST_I) { isEmpty(BOOST_I) {
BOOST_I = $$(BOOST_I) BOOST_I = $$(BOOST_I)
@ -262,10 +256,6 @@ SHARED_FLUID {
DEFINES += SHARED_FLUID DEFINES += SHARED_FLUID
} }
INI_ENCODING {
DEFINES += INI_ENCODING
}
defineReplace(xxdOutput) { defineReplace(xxdOutput) {
return($$basename(1).xxd) return($$basename(1).xxd)
} }

8
src/config.cpp
View file

@ -34,14 +34,6 @@
#include "util.h" #include "util.h"
#include "sdl-util.h" #include "sdl-util.h"
#ifdef INI_ENCODING
extern "C" {
#include <libguess.h>
}
#include <iconv.h>
#include <errno.h>
#endif
/* http://stackoverflow.com/a/1031773 */ /* http://stackoverflow.com/a/1031773 */
static bool validUtf8(const char *string) static bool validUtf8(const char *string)
{ {