fixed build after updating code from upstream

ohhmm · May 28, 2013 · cd4afc3 · cd4afc3
1 parent d57bba9
commit cd4afc3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/src/lib/synergy/CClientApp.cpp b/src/lib/synergy/CClientApp.cpp
@@ -412,7 +412,7 @@ CClient*
 CClientApp::openClient(const CString& name, const CBaseAddress& address, CScreen* screen, const CCryptoOptions& crypto)
 {
 	ITransportFactory* transportFactory = ITransportFactory::createFactory(address.getAddressType());
-	CClient* client = new CClient(*EVENTQUEUE, name, address, transportFactory, NULL, screen, crypto);
+	CClient* client = new CClient(EVENTQUEUE, name, address, transportFactory, NULL, screen, crypto);
 
 	try {
 		EVENTQUEUE->adoptHandler(

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
@@ -22,14 +22,12 @@ if (WIN32)
 	list(APPEND cpp_src ${cpp_hdr})
 endif()
 
-file(GLOB cpp_ignore
-	${cpp_dir}/simple.cpp
-	${cpp_dir}/strciphr.cpp
-	${cpp_dir}/polynomi.cpp
-	${cpp_dir}/eprecomp.cpp
-	${cpp_dir}/eccrypto.cpp
-	${cpp_dir}/algebra.cpp)
-list(REMOVE_ITEM cpp_src ${cpp_ignore})
+list(REMOVE_ITEM cpp_src ${cpp_dir}/simple.cpp)
+list(REMOVE_ITEM cpp_src ${cpp_dir}/strciphr.cpp)
+list(REMOVE_ITEM cpp_src ${cpp_dir}/polynomi.cpp)
+list(REMOVE_ITEM cpp_src ${cpp_dir}/eprecomp.cpp)
+list(REMOVE_ITEM cpp_src ${cpp_dir}/eccrypto.cpp)
+list(REMOVE_ITEM cpp_src ${cpp_dir}/algebra.cpp)
 
 # if 64-bit windows, compile asm file.
 if (CMAKE_CL_64)