fix compilation on windows

build/mingw32.mingw.cmake

@@ -7,14 +7,6 @@ set (CMAKE_SYSTEM_NAME "Windows")
 set (CROSS C:/Qt/Tools/mingw491_32)
 set (CROSSQT C:/Qt/5.4/mingw491_32)
 
-set (ProgramW6432 $ENV(ProgramW6432))
-if ($ProgramW6432)
-    set (ENV{FREETYPE_DIR} "$ENV{PROGRAMFILES(x86)}/GnuWin32")
-else ($ProgramW6432)
-    set (ENV{FREETYPE_DIR} "$ENV{PROGRAMFILES}/GnuWin32")
-endif ($ProgramW6432)
-
-
 set (CMAKE_C_COMPILER     ${CROSS}/bin/gcc.exe)
 set (CMAKE_CXX_COMPILER   ${CROSS}/bin/g++.exe)
 set (CMAKE_STRIP          ${CROSS}/bin/strip.exe)

mscore/CMakeLists.txt

@@ -385,6 +385,7 @@ if (MINGW)
       portaudio
       portmidi
       winmm
+      mscore_freetype
       z
       )
 
@@ -434,8 +435,6 @@ if (MINGW)
       ${CROSSQT}/bin/icudt53.dll
       ${CROSSQT}/bin/Qt5Help.dll
       ${CROSSQT}/bin/Qt5CLucene.dll
-      $ENV{FREETYPE_DIR}/bin/freetype6.dll
-      $ENV{FREETYPE_DIR}/bin/zlib1.dll
       ${PROJECT_SOURCE_DIR}/build/qt.conf
       DESTINATION bin)
 

thirdparty/freetype/CMakeLists.txt

@@ -29,7 +29,7 @@ if (APPLE)
     set(BUILD_SHARED_LIBS OFF)
 
     set(CMAKE_TOOLCHAIN_FILE
-      ${PROJECT_SOURCE_DIR}/thirdparty/freetyp/builds/cmake/iOS.cmake)
+      ${PROJECT_SOURCE_DIR}/thirdparty/freetype/builds/cmake/iOS.cmake)
   endif ()
 else ()
   if (DEFINED IOS_PLATFORM)
@@ -100,7 +100,7 @@ if (UNIX)
   file(WRITE "${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h"
     "${FTCONFIG_H}")
 else ()
-  file(READ "${PROJECT_SOURCE_DIR}/include/freetype/config/ftconfig.h"
+  file(READ "${PROJECT_SOURCE_DIR}/thirdparty/freetype/include/freetype/config/ftconfig.h"
     FTCONFIG_H)
   file(WRITE "${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h"
     "${FTCONFIG_H}")