Merge pull request #582 from andreasb242/windows-build

Windows build

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required (VERSION 2.8.8)
 
 project ("Xournal++" CXX C)
-set (PROJECT_VERSION "1.0.3")
+set (PROJECT_VERSION "1.0.4")
 set (PROJECT_PACKAGE "xournalpp")
 set (PROJECT_STRING "${PROJECT_NAME} ${PROJECT_VERSION}")
 set (PROJECT_URL "https://github.com/xournalpp/xournalpp")

src/control/XournalMain.cpp

@@ -59,6 +59,11 @@ void XournalMain::initLocalisation()
 
 	bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
 	textdomain(GETTEXT_PACKAGE);
+	
+#ifdef WIN32
+	bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+#endif
+	
 #endif //ENABLE_NLS
 
 	// Not working on Windows! Working on Linux, but not sure if it's needed