Revision 2b6b7099

b/configure
3891 3891

  
3892 3892
if test "$glx" = "yes" ; then
3893 3893
  echo "CONFIG_GLX=y" >> $config_host_mak
3894
  echo "GLX_LIBS=$glx_libs" >> $config_host_mak
3894 3895
fi
3895 3896

  
3896 3897
if test "$libiscsi" = "yes" ; then
......
4164 4165
target_nptl="no"
4165 4166
interp_prefix1=`echo "$interp_prefix" | sed "s/%M/$target_arch2/g"`
4166 4167
gdb_xml_files=""
4167
target_libs_softmmu=
4168 4168

  
4169 4169
TARGET_ARCH="$target_arch2"
4170 4170
TARGET_BASE_ARCH=""
......
4189 4189
    target_nptl="yes"
4190 4190
  ;;
4191 4191
  lm32)
4192
    target_libs_softmmu="$glx_libs"
4193 4192
  ;;
4194 4193
  m68k)
4195 4194
    bflt="yes"
......
4333 4332
fi
4334 4333
if test "$target_softmmu" = "yes" ; then
4335 4334
  echo "CONFIG_SOFTMMU=y" >> $config_target_mak
4336
  echo "LIBS+=$target_libs_softmmu" >> $config_target_mak
4337 4335
  case "$target_arch2" in
4338 4336
    i386|x86_64)
4339 4337
      echo "CONFIG_HAVE_CORE_DUMP=y" >> $config_target_mak
b/default-configs/lm32-softmmu.mak
2 2

  
3 3
CONFIG_LM32=y
4 4
CONFIG_MILKYMIST=y
5
CONFIG_MILKYMIST_TMU2=$(CONFIG_GLX)
5 6
CONFIG_FRAMEBUFFER=y
6 7
CONFIG_PTIMER=y
7 8
CONFIG_PFLASH_CFI01=y
b/hw/display/Makefile.objs
18 18
common-obj-$(CONFIG_MILKYMIST) += milkymist-vgafb.o
19 19
common-obj-$(CONFIG_ZAURUS) += tc6393xb.o
20 20

  
21
ifeq ($(CONFIG_GLX),y)
22
common-obj-$(CONFIG_MILKYMIST) += milkymist-tmu2.o
21
ifeq ($(CONFIG_MILKYMIST_TMU2),y)
22
common-obj-y += milkymist-tmu2.o
23
libs_softmmu += $(GLX_LIBS)
23 24
endif
24 25

  
25 26
obj-$(CONFIG_OMAP) += omap_dss.o

Also available in: Unified diff