Browse Source

Fix windows build

Tobias Hieta 9 years ago
parent
commit
e46a95f0db
2 changed files with 6 additions and 1 deletions
  1. 1 1
      CMakeModules/BreakpadSymbols.cmake
  2. 5 0
      CMakeModules/Win32Configuration.cmake

+ 1 - 1
CMakeModules/BreakpadSymbols.cmake

@@ -12,7 +12,7 @@ endif(NOT CRASHDUMP_SECRET)
 cmake_dependent_option(GENERATE_SYMBOLS "Should we generate symbols for binaries?" ON "ENABLE_CRASHDUMP" OFF)
 
 function(dumpsyms target symfile)
-  find_program(DUMP_SYMS dump_syms HINTS /usr/bin/ ${DEPENDENCY_ROOT}/bin ${DEPENDENCY_ROOT}/lib)
+  find_program(DUMP_SYMS dump_syms HINTS /usr/bin/ PATH_SUFFIXES lib bin)
   if(GENERATE_SYMBOLS AND NOT DUMP_SYMS)
     message(WARNING "dump_syms not found")
   endif()

+ 5 - 0
CMakeModules/Win32Configuration.cmake

@@ -5,6 +5,11 @@ set(HAVE_UPDATER 1)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Oy-")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Oy-")
 
+find_library(WINMM winmm)
+find_library(IMMLIB imm32)
+find_library(VERLIB version)
+set(OS_LIBS ${WINMM} ${IMMLIB} ${VERLIB})
+
 # Add install rules for required system runtimes such as MSVCRxx.dll
 SET (CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP ON)
 INCLUDE(InstallRequiredSystemLibraries)