fix compilation on win32

src/framework/CMakeLists.txt

@@ -16,8 +16,13 @@ IF(NOT CMAKE_BUILD_TYPE)
 ENDIF()
 
 # find needed libraries
+IF(WIN32)
+    SET(Boost_THREADAPI win32)
+ENDIF()
+
+SET(Boost_USE_MULTITHREADED ON)
 SET(Boost_USE_STATIC_LIBS ON)
-FIND_PACKAGE(Boost COMPONENTS system REQUIRED)
+FIND_PACKAGE(Boost COMPONENTS system thread REQUIRED)
 
 IF(USE_OPENGL_ES2)
     FIND_PACKAGE(OpenGLES2 REQUIRED)
@@ -37,6 +42,8 @@ FIND_PACKAGE(GMP REQUIRED)
 FIND_PACKAGE(ZLIB REQUIRED)
 FIND_PACKAGE(OpenAL REQUIRED)
 FIND_PACKAGE(VorbisFile REQUIRED)
+FIND_PACKAGE(Vorbis REQUIRED)
+FIND_PACKAGE(Ogg REQUIRED)
 
 # setup compiler options
 SET(CXX_WARNS "-Wall -Wextra -Werror -Wno-unused-parameter -Wno-unused-but-set-variable")
@@ -90,7 +97,10 @@ IF(WIN32)
 
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mthreads")
     ADD_DEFINITIONS(-D_WIN32_WINNT=0x0501)
-    SET(ADDITIONAL_LIBRARIES ws2_32 mswsock imagehlp)
+    SET(ADDITIONAL_LIBRARIES ws2_32 mswsock imagehlp winmm)
+
+    # fix boost thread linkage
+    ADD_DEFINITIONS(-DBOOST_THREAD_USE_LIB)
 
     SET(framework_SOURCES ${framework_SOURCES}
         ${CMAKE_CURRENT_LIST_DIR}/platform/win32window.cpp
@@ -116,24 +126,23 @@ ENDIF()
 INCLUDE_DIRECTORIES(
     ${Boost_INCLUDE_DIRS}
     ${OPENGL_INCLUDE_DIR}
-    ${OPENAL_INCLUDE_DIR}
+    ${OPENAL_INCLUDE_DIR} ${VORBISFILE_INCLUDE_DIR}
     ${LUA_INCLUDE_DIR}
     ${PHYSFS_INCLUDE_DIR}
     ${GMP_INCLUDE_DIR}
     ${ZLIB_INCLUDE_DIR}
-    ${VORBISFILE_INCLUDE_DIR}
     "${CMAKE_CURRENT_LIST_DIR}/.."
 )
 
 SET(framework_LIBRARIES
     ${Boost_LIBRARIES}
-    ${OPENGL_LIBRARIES}
-    ${OPENAL_LIBRARY}
     ${LUA_LIBRARIES}
     ${PHYSFS_LIBRARY}
     ${GMP_LIBRARY}
     ${ZLIB_LIBRARY}
-    ${VORBISFILE_LIBRARY}
+    ${VORBISFILE_LIBRARY} ${VORBIS_LIBRARY} ${OGG_LIBRARY}
+    ${OPENGL_LIBRARIES}
+    ${OPENAL_LIBRARY}
     ${ADDITIONAL_LIBRARIES}
 )