Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove glib_compat #1945

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,16 @@ else()
endif()

include_directories(
glib_compat
qemu
qemu/include
include
qemu/tcg
)

find_package(PkgConfig REQUIRED)
pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0)
set(UNICORN_LINK_LIBRARIES ${UNICORN_LINK_LIBRARIES} ${GLIB_LDFLAGS})

# Some distributions on some rare architecures don't auto link atomic for us and
# we do this manually by adding flags.
set(ATOMIC_LINKAGE_FIX FALSE)
Expand Down Expand Up @@ -1135,16 +1138,6 @@ set(UNICORN_COMMON_SRCS

list.c

glib_compat/glib_compat.c
glib_compat/gtestutils.c
glib_compat/garray.c
glib_compat/gtree.c
glib_compat/grand.c
glib_compat/glist.c
glib_compat/gmem.c
glib_compat/gpattern.c
glib_compat/gslice.c

qemu/util/bitmap.c
qemu/util/bitops.c
qemu/util/crc32c.c
Expand Down Expand Up @@ -1399,6 +1392,10 @@ target_include_directories(unicorn PUBLIC
include
)

target_include_directories(unicorn-common PUBLIC
${GLIB_INCLUDE_DIRS}
)

# For static archive
if (BUILD_SHARED_LIBS)
target_include_directories(unicorn_static PUBLIC
Expand Down
2 changes: 0 additions & 2 deletions glib_compat/README

This file was deleted.

Loading
Loading