ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/mports/trunk/emulators/bochs/Makefile
(Generate patch)

Comparing trunk/emulators/bochs/Makefile (file contents):
Revision 14012 by laffer1, Thu Apr 11 12:24:39 2013 UTC vs.
Revision 14075 by laffer1, Fri May 10 02:15:28 2013 UTC

# Line 1 | Line 1
1 < # $MidnightBSD: mports/emulators/bochs/Makefile,v 1.10 2013/04/11 12:21:50 laffer1 Exp $
1 > # $MidnightBSD: mports/emulators/bochs/Makefile,v 1.11 2013/04/11 12:24:39 laffer1 Exp $
2  
3   PORTNAME=       bochs
4   PORTVERSION=    2.6.1
5 + PORTREVISION=   1
6   PORTEPOCH=      2
7   CATEGORIES=     emulators
8   MASTER_SITES=   SF
# Line 19 | Line 20 | OPTIONS_DEFINE=        A20_PIN ALIGN_CHECK ASSERT_CHECK \
20                  MWAIT NE2000 OPTIMIZATIONS PCI PLUGINS PNIC \
21                  RAW_SERIAL READLINE REPEAT_SPEED RFB \
22                  SB16 SDL SHOW_IPS SMP SVGA SVM TERM USB USB_OHCI USB_XHCI \
23 <                VMX WX X11 X86_64 XPM
23 >                VMX VOODOO WXGTK X11 X86_64 XPM
24   OPTIONS_RADIO=  DEBUG
25   OPTIONS_RADIO_DEBUG=    DEBUGGER GDB_STUB
26   OPTIONS_DEFAULT=A20_PIN ALIGN_CHECK CDROM CONF_MSRS DISASM FPU LOGGING \
# Line 48 | Line 49 | IODEBUG_DESC=  Enable I/O interface to debugger
49   LARGE_RAMFILE_DESC=     Enable large ramfile support
50   LOGGING_DESC=   Enable logging
51   LONG_PHY_ADDR_DESC=     Enable support for physical address >= 32bit
51 MISALIGNEDSSE_DESC=     Enable misaligned SSE support
52   MWAIT_DESC=     Enable experimental MONITOR/MWAIT support
53   NE2000_DESC=    Enable limited ne2000 support
54   OPTIMIZATIONS_DESC=     Enable all safe speed optimizations
# Line 70 | Line 70 | USB_DESC=      Enable limited USB UHCI support
70   USB_OHCI_DESC=  Enable limited USB OHCI support
71   USB_XHCI_DESC=  Enable limited USB xHCI support
72   VMX_DESC=       Enable Virtialization extensions
73 < WX_DESC=        Use WxWidgets display interface
73 > VOODOO_DESC=    Enable 3dfx Voodoo Graphics emulation
74   X86_64_DESC=    Enable AMD x86-64 support
75   XPM_DESC=       Enable XPM library support
76  
# Line 92 | Line 92 | SUB_FILES=     pkg-message
92  
93   .include <bsd.mport.options.mk>
94  
95 < .if empty(PORT_OPTIONS:MTERM) && empty(PORT_OPTIONS:MWX) && empty(PORT_OPTIONS:MX11)
95 > .if empty(PORT_OPTIONS:MTERM) && empty(PORT_OPTIONS:MWXGTK) && empty(PORT_OPTIONS:MX11)
96   CONFIGURE_ARGS+=--with-nogui
97   .endif
98  
# Line 184 | Line 184 | CONFIGURE_ARGS+=--disable-fast-function-calls
184   CONFIGURE_ARGS+=--enable-fpu
185   .else
186   CONFIGURE_ARGS+=--disable-fpu
187 + WITH_CPU_LEVEL= 3
188   .endif
189  
190   .if ${PORT_OPTIONS:MGAMEPORT}
# Line 353 | Line 354 | WITH_CPU_LEVEL=        6
354   CONFIGURE_ARGS+=--disable-vmx
355   .endif
356  
357 < .if ${PORT_OPTIONS:MWX}
357 > .if ${PORT_OPTIONS:MVOODOO}
358 > CONFIGURE_ARGS+=--enable-voodoo
359 > .else
360 > CONFIGURE_ARGS+=--disable-voodoo
361 > .endif
362 >
363 > .if ${PORT_OPTIONS:MWXGTK}
364   USE_WX=         2.4+
358 CONFIGURE_ENV=  WX_CONFIG="${WX_CONFIG}"
365   CONFIGURE_ARGS+=--with-wx
366   .else
367   CONFIGURE_ARGS+=--disable-debugger-gui
# Line 368 | Line 374 | CONFIGURE_ARGS+=--with-x11
374  
375   .if ${PORT_OPTIONS:MX86_64}
376   CONFIGURE_ARGS+=--enable-x86-64
377 + WITH_CPU_LEVEL= 6
378   .else
379   CONFIGURE_ARGS+=--disable-x86-64
380   .endif
# Line 393 | Line 400 | CONFIGURE_ENV+=        SOUND_LINK_OPTS="-L${LOCALBASE}/lib"
400  
401   .if ${PORT_OPTIONS:MGDB_STUB} && ${PORT_OPTIONS:MSMP}
402   IGNORE=         GDB_STUB is incompatible with multiprocessor
403 + .endif
404 +
405 + .if empty(PORT_OPTIONS:MPCI) && ${PORT_OPTIONS:MVOODOO}
406 + IGNORE=         3dfx Voodoo Graphics emulation requires PCI support
407   .endif
408  
409   pre-everything::

Comparing trunk/emulators/bochs/Makefile (property cvs2svn:cvs-rev):
Revision 14012 by laffer1, Thu Apr 11 12:24:39 2013 UTC vs.
Revision 14075 by laffer1, Fri May 10 02:15:28 2013 UTC

# Line 1 | Line 1
1 < 1.11
1 > 1.12

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines