diff --git a/assets/manifest.xml b/assets/manifest.xml deleted file mode 100644 index 9a8044c..0000000 --- a/assets/manifest.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/assets/resources.rc b/assets/resources.rc index 6415ac9..bd4b12a 100644 --- a/assets/resources.rc +++ b/assets/resources.rc @@ -1,3 +1,2 @@ #include -1 RT_MANIFEST "assets/manifest.xml" MAINICON ICON "assets/icon.ico" diff --git a/mkxp.pro b/mkxp.pro index 9cae776..cc48c5c 100644 --- a/mkxp.pro +++ b/mkxp.pro @@ -85,7 +85,7 @@ unix { win32 { CONFIG += link_pkgconfig PKGCONFIG += sigc++-2.0 pixman-1 zlib \ - sdl2 SDL2_image SDL2_ttf openal SDL_sound vorbisfile + sdl2 SDL2_image SDL2_ttf openal SDL_sound vorbisfile freetype2 LIBS += -lphysfs -lboost_program_options-mt -lsecur32 # Deal with boost paths... @@ -317,8 +317,7 @@ BINDING_MRUBY { BINDING_MRI { isEmpty(MRIVERSION) { - win32:MRIVERSION = 2.1 - unix:MRIVERSION = 2.2 + MRIVERSION = 2.2 } PKGCONFIG += ruby-$$MRIVERSION