some fix

avplayer · May 28, 2015 · 76210c3 · 76210c3
1 parent 3972d12
commit 76210c3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -340,7 +340,7 @@ endif()
 
 if(WIN32)
 	if(MSVC)
-		set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} "/MANIFESTINPUT:${CMAKE_CURRENT_SOURCE_DIR}/dpi.manifest")
+		set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFESTINPUT:${CMAKE_CURRENT_SOURCE_DIR}/dpi.manifest")
 	endif()
 
 	if(NOT MSVC)

diff --git a/rpc/dbusrpc.cpp b/rpc/dbusrpc.cpp
@@ -57,7 +57,8 @@ DBusRPC::DBusRPC(boost::asio::io_service& io, on_message_signal_type & on_messag
 
 SearchResult DBusRPC::search(QString searchstring)
 {
-
+	SearchResult ret;
+	return ret;
 }