Revision 14015304
| b/Makefile.objs | ||
|---|---|---|
| 400 | 400 |
|
| 401 | 401 |
vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS) |
| 402 | 402 |
|
| 403 |
vl.o: QEMU_CFLAGS+=$(GLIB_CFLAGS) |
|
| 403 |
QEMU_CFLAGS+=$(GLIB_CFLAGS) |
|
| 404 |
|
|
| b/configure | ||
|---|---|---|
| 1848 | 1848 |
if $pkg_config --modversion gthread-2.0 > /dev/null 2>&1 ; then |
| 1849 | 1849 |
glib_cflags=`$pkg_config --cflags gthread-2.0 2>/dev/null` |
| 1850 | 1850 |
glib_libs=`$pkg_config --libs gthread-2.0 2>/dev/null` |
| 1851 |
libs_softmmu="$glib_libs $libs_softmmu" |
|
| 1852 |
libs_tools="$glib_libs $libs_tools" |
|
| 1851 |
LIBS="$glib_libs $LIBS" |
|
| 1853 | 1852 |
else |
| 1854 | 1853 |
echo "glib-2.0 required to compile QEMU" |
| 1855 | 1854 |
exit 1 |
| b/libcacard/Makefile | ||
|---|---|---|
| 15 | 15 |
|
| 16 | 16 |
QEMU_CFLAGS+=-I../ |
| 17 | 17 |
|
| 18 |
QEMU_CFLAGS+=$(GLIB_CFLAGS) |
|
| 19 |
|
|
| 18 | 20 |
libcacard.lib-y=$(addsuffix .lo,$(basename $(libcacard-y))) |
| 19 | 21 |
|
| 20 | 22 |
vscclient: $(libcacard-y) $(QEMU_OBJS) vscclient.o |
| 21 |
$(call quiet-command,$(CC) $(libcacard_libs) -lrt -o $@ $^," LINK $@") |
|
| 23 |
$(call quiet-command,$(CC) $(libcacard_libs) $(LIBS) -lrt -o $@ $^," LINK $@")
|
|
| 22 | 24 |
|
| 23 | 25 |
clean: |
| 24 | 26 |
rm -f *.o */*.o *.d */*.d *.a */*.a *~ */*~ vscclient *.lo .libs/* *.la *.pc |
| b/qemu-common.h | ||
|---|---|---|
| 37 | 37 |
#include <sys/time.h> |
| 38 | 38 |
#include <assert.h> |
| 39 | 39 |
#include <signal.h> |
| 40 |
#include <glib.h> |
|
| 40 | 41 |
|
| 41 | 42 |
#ifdef _WIN32 |
| 42 | 43 |
#include "qemu-os-win32.h" |
Also available in: Unified diff