Merge pull request #855 from Speciesx/patch-1

few changes for new windows deps
RigsOfRods · Apr 27, 2016 · db80f5d · db80f5d
2 parents 3de738e + ad508f8
commit db80f5d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/cmake/DependenciesConfig.cmake b/cmake/DependenciesConfig.cmake
@@ -120,7 +120,7 @@ endmacro(importLib)
 	endif(ROR_USE_CURL)
 
 	set(PThread_INCLUDE_DIRS "${ROR_DEPENDENCIES_DIR}/includes/${ARCH_DIR}/pthread" CACHE PATH "The pthread include path to use")
-	set(PThread_LIBRARIES "optimized;${ROR_DEPENDENCIES_DIR}/libs/${ARCH_DIR}/pthread/Release/pthreadVC2.lib" CACHE STRING "The pthread lib to link against")
+	set(PThread_LIBRARIES "optimized;${ROR_DEPENDENCIES_DIR}/libs/${ARCH_DIR}/pthread/Release/pthreadsVC2.lib" CACHE STRING "The pthread lib to link against")
 	include_directories(${PThread_INCLUDE_DIRS})
 
 	# directX
@@ -135,8 +135,8 @@ endmacro(importLib)
 		set(MYGUI_INCLUDE_DIRS "${ROR_DEPENDENCIES_DIR}/includes/${ARCH_DIR}/MyGUI" CACHE PATH "The mygui include path to use")
 		importLib(MyGUIEngineStatic MyGUI)
 		importLib(MyGUI.OgrePlatform MyGUI)
-		importLib(freetype2311 MyGUI)
-		set(MYGUI_LIBRARIES "MyGUI.OgrePlatform;MyGUIEngineStatic;freetype2311" CACHE STRING "The mygui libs to link against")
+		importLib(freetype MyGUI)
+		set(MYGUI_LIBRARIES "MyGUI.OgrePlatform;MyGUIEngineStatic;freetype" CACHE STRING "The mygui libs to link against")
 	endif(ROR_USE_MYGUI)
 
 	if(ROR_USE_OPENAL)
@@ -147,8 +147,8 @@ endmacro(importLib)
 
 	if(ROR_USE_SOCKETW)
 		set(SOCKETW_INCLUDE_DIRS "${ROR_DEPENDENCIES_DIR}/includes/${ARCH_DIR}/SocketW" CACHE PATH "The socketw include path to use")
-		importLib(mysocketw SocketW)
-		set(SOCKETW_LIBRARIES    "mysocketw;Ws2_32.lib" CACHE STRING "The socketw lib to link against")
+		importLib(SocketW SocketW)
+		set(SOCKETW_LIBRARIES    "SocketW;Ws2_32.lib" CACHE STRING "The socketw lib to link against")
 	endif(ROR_USE_SOCKETW)
 
 	if(ROR_USE_MOFILEREADER)

diff --git a/source/configurator/CMakeLists.txt b/source/configurator/CMakeLists.txt
@@ -22,7 +22,7 @@ if(WIN32)
 	# use precompiled stuff
 	set(wxWidgets_INCLUDE_DIRS "${ROR_DEPENDENCIES_DIR}/includes/${ARCH_DIR}/WxWidgets" CACHE PATH "The wxWidgets include path to use")
 	set(wxWidgets_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/libs/${ARCH_DIR}/WxWidgets/Release" CACHE PATH "The wxWidgets lib path to use")
-	set(wxWidgets_LIBRARIES    "wxbase29u.lib;wxmsw29u_core.lib;wxmsw29u_html.lib;wxbase29u_net.lib;wxmsw29u_adv.lib;wxpng.lib;wxtiff.lib;wxjpeg.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;winmm.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;" CACHE STRING "The wxWidgets lib to link against")
+	set(wxWidgets_LIBRARIES    "wxbase31u.lib;wxmsw31u_core.lib;wxmsw31u_html.lib;wxbase31u_net.lib;wxmsw31u_adv.lib;wxpng.lib;wxtiff.lib;wxjpeg.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;winmm.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;" CACHE STRING "The wxWidgets lib to link against")
 	add_definitions("-D_UNICODE -D_CRT_SECURE_NO_WARNINGS -DUNICODE")
 	include_directories(${wxWidgets_INCLUDE_DIRS})
 	link_directories (${wxWidgets_LIBRARY_DIRS})