update: glib.h include path

2025-01-23 13:42:55 +08:00 · 2022-02-16 10:56:33 +08:00 · 2022-02-16 10:56:33 +08:00 · f1c41c074e
commit f1c41c074e
parent 936f99c3e7
36 changed files with 48 additions and 35 deletions
--- a/DSView/CMakeLists.txt
+++ b/DSView/CMakeLists.txt
@ -119,7 +119,7 @@ set(DS_VERSION_MAJOR 1)
 set(DS_VERSION_MINOR 2)
 set(DS_VERSION_MICRO 0)
 set(DS_VERSION_STRING
-	${DS_VERSION_MAJOR}.${DS_VERSION_MINOR}.${DS_VERSION_MICRO}
+	${DS_VERSION_MAJOR}.${DS_VERSION_MINOR}.${DS_VERSION_MICRO} RC1
 )

 configure_file (
--- a/DSView/clean
+++ b/DSView/clean
@ -0,0 +1,13 @@
+echo "rm cmake cache begin..."
+rm ./cmake_install.cmake
+rm -r ./CMakeFiles
+rm ./Makefile
+rm ./CMakeCache.txt
+rm ./*.cmake
+rm ./DSView
+rm ./DSView.qrc.depends
+sudo rm ./install_manifest.txt
+
+find . -name 'moc_*.cpp*' | xargs rm -rf
+find . -name 'qrc_*.cpp' | xargs rm -rf
+echo "rm cmake cache end..."
--- a/DSView/config.h
+++ b/DSView/config.h
@ -29,6 +29,6 @@
 #define DS_VERSION_MAJOR 1
 #define DS_VERSION_MINOR 2
 #define DS_VERSION_MICRO 0
-#define DS_VERSION_STRING "1.2.0"
+#define DS_VERSION_STRING "1.2.0;RC1"

 #endif
--- a/DSView/pv/data/decode/decoder.h
+++ b/DSView/pv/data/decode/decoder.h
@ -28,7 +28,7 @@
 #include <sstream>
 #include <iostream>
  
-#include <glib.h>
+#include <glib-2.0/glib.h>

 struct srd_decoder;
 struct srd_decoder_inst;
--- a/DSView/pv/device/devinst.h
+++ b/DSView/pv/device/devinst.h
@ -25,7 +25,7 @@
 #include <QObject>

 #include <string>
-#include <glib.h>
+#include <glib-2.0/glib.h>
 #include <stdint.h>

 #include <libsigrok4DSL/libsigrok.h>
--- a/DSView/pv/devicemanager.h
+++ b/DSView/pv/devicemanager.h
@ -24,7 +24,7 @@
 #ifndef DSVIEW_PV_DEVICEMANAGER_H
 #define DSVIEW_PV_DEVICEMANAGER_H

-#include <glib.h>
+#include <glib-2.0/glib.h>

 #include <list>
 #include <map>
--- a/DSView/pv/mainwindow.cpp
+++ b/DSView/pv/mainwindow.cpp
@ -86,7 +86,7 @@
 #include <inttypes.h>
 #include <stdint.h>
 #include <stdarg.h>
-#include <glib.h>
+#include <glib-2.0/glib.h>
 #include <list>
 #include "ui/msgbox.h"
 #include "config/appconfig.h"
--- a/DSView/pv/prop/binding/binding.h
+++ b/DSView/pv/prop/binding/binding.h
@ -24,7 +24,7 @@
 #ifndef DSVIEW_PV_PROP_BINDING_BINDING_H
 #define DSVIEW_PV_PROP_BINDING_BINDING_H

-#include <glib.h>
+#include <glib-2.0/glib.h>

 #include <vector>
 #include <map> 
--- a/DSView/pv/prop/property.h
+++ b/DSView/pv/prop/property.h
@ -23,7 +23,7 @@
 #ifndef DSVIEW_PV_PROP_PROPERTY_H
 #define DSVIEW_PV_PROP_PROPERTY_H

-#include <glib.h>
+#include <glib-2.0/glib.h>

 #include <boost/function.hpp>

--- a/libsigrok4DSL/backend.c
+++ b/libsigrok4DSL/backend.c
@ -20,7 +20,7 @@

 #include "libsigrok.h"
 #include "libsigrok-internal.h"
-#include <glib.h>
+#include <glib-2.0/glib.h>
 #include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */

 /**
--- a/libsigrok4DSL/dsdevice.c
+++ b/libsigrok4DSL/dsdevice.c
@ -20,7 +20,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 #include <stdio.h>
-#include <glib.h>
+#include <glib-2.0/glib.h>
 #include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */

 /* Message logging helpers with subsystem-specific prefix string. */
--- a/libsigrok4DSL/hardware/DSL/command.h
+++ b/libsigrok4DSL/hardware/DSL/command.h
@ -20,7 +20,7 @@
 #ifndef LIBDSL_HARDWARE_COMMAND_H
 #define LIBDSL_HARDWARE_COMMAND_H

-#include <glib.h>
+#include <glib-2.0/glib.h>
 #include "../../libsigrok.h"
 #include "../../libsigrok-internal.h"

--- a/libsigrok4DSL/hardware/DSL/dsl.h
+++ b/libsigrok4DSL/hardware/DSL/dsl.h
@ -21,7 +21,7 @@
 #ifndef LIBDSL_HARDWARE_DSL_H
 #define LIBDSL_HARDWARE_DSL_H

-#include <glib.h>
+#include <glib-2.0/glib.h>
 #include "../../libsigrok.h"
 #include "../../libsigrok-internal.h"
 #include "command.h"
--- a/libsigrok4DSL/hardware/common/ezusb.c
+++ b/libsigrok4DSL/hardware/common/ezusb.c
@ -23,7 +23,7 @@
 #include "../../libsigrok.h"
 #include "../../libsigrok-internal.h"
 //#include <libusb.h>
-#include <glib.h>
+#include <glib-2.0/glib.h>
 #include <glib/gstdio.h>
 #include <stdio.h>
 #include <errno.h>
--- a/libsigrok4DSL/hardware/common/usb.c
+++ b/libsigrok4DSL/hardware/common/usb.c
@ -20,7 +20,7 @@
 #include "../../libsigrok.h"
 #include "../../libsigrok-internal.h"
 #include <stdlib.h>
-#include <glib.h>
+#include <glib-2.0/glib.h>
 //#include <libusb.h>

 /* SR_CONF_CONN takes one of these: */
--- a/libsigrok4DSL/hardware/demo/demo.h
+++ b/libsigrok4DSL/hardware/demo/demo.h
@ -21,7 +21,7 @@
 #ifndef LIBDSL_HARDWARE_DEMO_H
 #define LIBDSL_HARDWARE_DEMO_H

-#include <glib.h>
+#include <glib-2.0/glib.h>
 #include "../../libsigrok.h"
 #include "../../libsigrok-internal.h"

--- a/libsigrok4DSL/hwdriver.c
+++ b/libsigrok4DSL/hwdriver.c
@ -24,7 +24,7 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <string.h>
-#include <glib.h>
+#include <glib-2.0/glib.h>
 #include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */

 #include "hardware/DSL/dsl.h"
--- a/libsigrok4DSL/input/in_vcd.c
+++ b/libsigrok4DSL/input/in_vcd.c
@ -60,7 +60,7 @@
 #include "../libsigrok.h"
 #include "../libsigrok-internal.h"
 #include <stdlib.h>
-#include <glib.h>
+#include <glib-2.0/glib.h>
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
--- a/libsigrok4DSL/libsigrok-internal.h
+++ b/libsigrok4DSL/libsigrok-internal.h
@ -21,7 +21,7 @@
 #define LIBSIGROK_SIGROK_INTERNAL_H

 //#include <stdarg.h>
-#include <glib.h>
+#include <glib-2.0/glib.h>
 #include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
 #ifdef HAVE_LIBUSB_1_0
 #include <libusb.h>
--- a/libsigrok4DSL/libsigrok.h
+++ b/libsigrok4DSL/libsigrok.h
@ -26,7 +26,7 @@
 #include <sys/time.h>
 #include <stdint.h>
 #include <inttypes.h>
-#include <glib.h>
+#include <glib-2.0/glib.h>
 #include <zip.h>

 #ifdef __cplusplus
--- a/libsigrok4DSL/output/csv.c
+++ b/libsigrok4DSL/output/csv.c
@ -22,7 +22,7 @@
 #include "../libsigrok-internal.h"
 #include <stdlib.h>
 #include <string.h>
-#include <glib.h>
+#include <glib-2.0/glib.h>
 #include "../config.h" /* Needed for PACKAGE_STRING and others. */

 #define LOG_PREFIX "output/csv"
--- a/libsigrok4DSL/output/gnuplot.c
+++ b/libsigrok4DSL/output/gnuplot.c
@ -24,7 +24,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <inttypes.h>
-#include <glib.h>
+#include <glib-2.0/glib.h>
 #include "../config.h" /* Needed for PACKAGE_STRING and others. */

 #define LOG_PREFIX "output/gnuplot"
--- a/libsigrok4DSL/output/srzip.c
+++ b/libsigrok4DSL/output/srzip.c
@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <glib.h>
+#include <glib-2.0/glib.h>
 #include <glib/gstdio.h>
 #include <zip.h>

--- a/libsigrok4DSL/output/vcd.c
+++ b/libsigrok4DSL/output/vcd.c
@ -23,7 +23,7 @@
 #include "../libsigrok-internal.h"
 #include <stdlib.h>
 #include <string.h>
-#include <glib.h>
+#include <glib-2.0/glib.h>
 #include "../config.h" /* Needed for PACKAGE and others. */

 #define LOG_PREFIX "output/vcd"
--- a/libsigrok4DSL/session.c
+++ b/libsigrok4DSL/session.c
@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <glib.h>
+#include <glib-2.0/glib.h>

 /* Message logging helpers with subsystem-specific prefix string. */
 #define LOG_PREFIX "session: "
--- a/libsigrok4DSL/session_file.c
+++ b/libsigrok4DSL/session_file.c
@ -26,7 +26,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include <glib.h>
+#include <glib-2.0/glib.h>
 #include <glib/gstdio.h>
 #include "config.h" /* Needed for PACKAGE_VERSION and others. */

--- a/libsigrok4DSL/std.c
+++ b/libsigrok4DSL/std.c
@ -20,7 +20,7 @@

 #include "libsigrok.h"
 #include "libsigrok-internal.h"
-#include <glib.h>
+#include <glib-2.0/glib.h>

 /**
 * Standard sr_driver_init() API helper.
--- a/libsigrok4DSL/trigger.c
+++ b/libsigrok4DSL/trigger.c
@ -9,7 +9,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <assert.h>
-#include <glib.h>
+#include <glib-2.0/glib.h>

 /* Message logging helpers with subsystem-specific prefix string. */
 #define LOG_PREFIX "session: "
--- a/libsigrokdecode4DSL/config.h
+++ b/libsigrokdecode4DSL/config.h
@ -80,7 +80,7 @@
 #define SRD_PACKAGE_VERSION_MINOR 6

 /* Version of libsigrokdecode4DSL. */
-#define SRD_PACKAGE_VERSION_STRING "0.6.0-git-f18df52"
+#define SRD_PACKAGE_VERSION_STRING "0.6.0-git-936f99c"

 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
--- a/libsigrokdecode4DSL/decoder.c
+++ b/libsigrokdecode4DSL/decoder.c
@ -22,7 +22,7 @@
 #include "config.h"
 #include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #include "libsigrokdecode.h"
-#include <glib.h>
+#include <glib-2.0/glib.h>

 /**
 * @file
--- a/libsigrokdecode4DSL/exception.c
+++ b/libsigrokdecode4DSL/exception.c
@ -21,7 +21,7 @@
 #include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #include "libsigrokdecode.h"
 #include <stdarg.h>
-#include <glib.h>
+#include <glib-2.0/glib.h>

 static char *py_stringify(PyObject *py_obj)
 {
--- a/libsigrokdecode4DSL/instance.c
+++ b/libsigrokdecode4DSL/instance.c
@ -22,7 +22,7 @@
 #include "config.h"
 #include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #include "libsigrokdecode.h"
-#include <glib.h>
+#include <glib-2.0/glib.h>
 #include <inttypes.h>
 #include <stdlib.h>
 #include <stdint.h>
--- a/libsigrokdecode4DSL/libsigrokdecode.h
+++ b/libsigrokdecode4DSL/libsigrokdecode.h
@ -23,7 +23,7 @@
 #define LIBSIGROKDECODE_LIBSIGROKDECODE_H

 #include <stdint.h>
-#include <glib.h>
+#include <glib-2.0/glib.h>

 #define DECODE_NUM_HEX_MAX_LEN		35

--- a/libsigrokdecode4DSL/session.c
+++ b/libsigrokdecode4DSL/session.c
@ -22,7 +22,7 @@
 #include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #include "libsigrokdecode.h"
 #include <inttypes.h>
-#include <glib.h>
+#include <glib-2.0/glib.h>

 /**
 * @file
--- a/libsigrokdecode4DSL/srd.c
+++ b/libsigrokdecode4DSL/srd.c
@ -21,7 +21,7 @@
 #include "config.h"
 #include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #include "libsigrokdecode.h"
-#include <glib.h>
+#include <glib-2.0/glib.h>

 /** @cond PRIVATE */

--- a/libsigrokdecode4DSL/version.h
+++ b/libsigrokdecode4DSL/version.h
@ -48,7 +48,7 @@
 #define SRD_PACKAGE_VERSION_MICRO 0

 /** The libsigrokdecode package version ("major.minor.micro") as string. */
-#define SRD_PACKAGE_VERSION_STRING "0.6.0-git-f18df52"
+#define SRD_PACKAGE_VERSION_STRING "0.6.0-git-936f99c"

 /*
 * Library/libtool version macros (can be used for conditional compilation).