Skip to content

Commit 024cb28

Browse files
committed
Remove glib_compat
1 parent 38091b3 commit 024cb28

28 files changed

+11
-6594
lines changed

CMakeLists.txt

+8-11
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,16 @@ else()
8282
endif()
8383

8484
include_directories(
85-
glib_compat
8685
qemu
8786
qemu/include
8887
include
8988
qemu/tcg
9089
)
9190

91+
find_package(PkgConfig REQUIRED)
92+
pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0)
93+
set(UNICORN_LINK_LIBRARIES ${UNICORN_LINK_LIBRARIES} ${GLIB_LDFLAGS})
94+
9295
# Some distributions on some rare architecures don't auto link atomic for us and
9396
# we do this manually by adding flags.
9497
set(ATOMIC_LINKAGE_FIX FALSE)
@@ -1135,16 +1138,6 @@ set(UNICORN_COMMON_SRCS
11351138

11361139
list.c
11371140

1138-
glib_compat/glib_compat.c
1139-
glib_compat/gtestutils.c
1140-
glib_compat/garray.c
1141-
glib_compat/gtree.c
1142-
glib_compat/grand.c
1143-
glib_compat/glist.c
1144-
glib_compat/gmem.c
1145-
glib_compat/gpattern.c
1146-
glib_compat/gslice.c
1147-
11481141
qemu/util/bitmap.c
11491142
qemu/util/bitops.c
11501143
qemu/util/crc32c.c
@@ -1399,6 +1392,10 @@ target_include_directories(unicorn PUBLIC
13991392
include
14001393
)
14011394

1395+
target_include_directories(unicorn-common PUBLIC
1396+
${GLIB_INCLUDE_DIRS}
1397+
)
1398+
14021399
# For static archive
14031400
if (BUILD_SHARED_LIBS)
14041401
target_include_directories(unicorn_static PUBLIC

glib_compat/README

-2
This file was deleted.

0 commit comments

Comments
 (0)