Commit 14015304 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Make glib mandatory and fixup utils appropriately 



Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 0ac543de

Makefile.objs

+2 −1
Original line number Diff line number Diff line
@@ -400,4 +400,5 @@ vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS) 


vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS)



vl.o: QEMU_CFLAGS+=$(GLIB_CFLAGS)
 
QEMU_CFLAGS+=$(GLIB_CFLAGS)

configure

+1 −2
Original line number Diff line number Diff line
@@ -1848,8 +1848,7 @@ fi 
if $pkg_config --modversion gthread-2.0 > /dev/null 2>&1 ; then

    glib_cflags=`$pkg_config --cflags gthread-2.0 2>/dev/null`

    glib_libs=`$pkg_config --libs gthread-2.0 2>/dev/null`

    libs_softmmu="$glib_libs $libs_softmmu"

    libs_tools="$glib_libs $libs_tools"

    LIBS="$glib_libs $LIBS"

else

    echo "glib-2.0 required to compile QEMU"

    exit 1

libcacard/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -15,10 +15,12 @@ QEMU_OBJS_LIB=$(addsuffix .lo,$(basename $(QEMU_OBJS))) 


QEMU_CFLAGS+=-I../



QEMU_CFLAGS+=$(GLIB_CFLAGS)



libcacard.lib-y=$(addsuffix .lo,$(basename $(libcacard-y)))



vscclient: $(libcacard-y) $(QEMU_OBJS) vscclient.o

	$(call quiet-command,$(CC) $(libcacard_libs) -lrt -o $@ $^,"  LINK  $@")

	$(call quiet-command,$(CC) $(libcacard_libs) $(LIBS) -lrt -o $@ $^,"  LINK  $@")



clean:

	rm -f *.o */*.o *.d */*.d *.a */*.a *~ */*~ vscclient *.lo .libs/* *.la *.pc

qemu-common.h

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ typedef struct Monitor Monitor; 
#include <sys/time.h>

#include <assert.h>

#include <signal.h>

#include <glib.h>



#ifdef _WIN32

#include "qemu-os-win32.h"