minor fix

fixed typo in usage updated CmakeLists for win32-qtcreator: added option RTL_FULL_STATIC_BUILD librtlsdr-win32-v0.6.0.zip is missing libusb-1.0.dll, pthreadGC2.dll and libgcc_s_dw2-1.dll Signed-off-by: hayati ayguen <h_ayguen@web.de>
librtlsdr · Aug 29, 2016 · 35bf7ad · 35bf7ad
1 parent 751bc98
commit 35bf7ad
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/src/rtl_ir.c b/src/rtl_ir.c
@@ -61,7 +61,7 @@ struct dongle_state
 
 void dongle_init(struct dongle_state *s)
 {
-    bzero(s, sizeof(struct dongle_state));
+    memset(s, 0, sizeof(struct dongle_state));
 }
 
 struct dongle_state dongle;
@@ -77,7 +77,7 @@ void usage(void)
 		"\t[-b]\tDisplay output in binary (default), pulse=1, space=0; each 20 usec\n"
 		"\t[-t]\tDisplay output in text format\n"
 		"\t[-x]\tDisplay output in raw packed bytes, MSB=pulse/space, 7LSB=duration*20 usec\n"
-		"\t[-h\t]Help\n"
+        "\t[-h]\tHelp\n"
 		);
 	exit(1);
 }

diff --git a/win32-qtcreator/CMakeLists.txt b/win32-qtcreator/CMakeLists.txt
@@ -2,10 +2,10 @@ project(rtlsdr)
 cmake_minimum_required(VERSION 2.8)
 
 # created and tested with
-# Qt 5.5.1 for Windows 32-bit (MinGW 4.9.2) from
+# Qt 5.6.1 for Windows 32-bit (MinGW 4.9.2) from
 # https://www.qt.io/download-open-source/#section-2
 #
-# and QtCreator 4.0.0
+# and QtCreator 4.1.0
 #
 # and LibUSB 1.0.20 from
 # https://sourceforge.net/projects/libusb/files/
@@ -15,6 +15,22 @@ cmake_minimum_required(VERSION 2.8)
 # edit this path
 SET( LIBUSBBASE C:/src/_foreign/libusb-1.0.20 )
 
+OPTION(RTL_FULL_STATIC_BUILD "Build rtl-tools fully static." OFF)
+
+if(RTL_FULL_STATIC_BUILD)
+    if (WIN32)
+        if(MINGW)
+            # Special MINGW stuff here
+            # see https://cmake.org/pipermail/cmake/2012-September/051970.html
+            # see http://stackoverflow.com/questions/13768515/how-to-do-static-linking-of-libwinpthread-1-dll-in-mingw
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static -static-libgcc")
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static -static-libgcc -static-libstdc++")
+            set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS} -static -static-libgcc -s")
+            set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS} -static -static-libgcc -static-libstdc++ -s")
+        endif()
+    endif()
+endif()
+
 
 add_definitions( -DWIN32 -D_WIN32 -DNDEBUG )
 
@@ -73,3 +89,5 @@ target_link_libraries( rtl_adsb ${LIBUSB} )
 add_executable( rtl_power ../src/rtl_power.c ${RTLLIBFILES} )
 target_link_libraries( rtl_power ${LIBUSB} )
 
+add_executable( rtl_ir ../src/rtl_ir.c ${RTLLIBFILES} )
+target_link_libraries( rtl_ir ${LIBUSB} )