Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-04 17:01:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

add tgetopt to the list of static libs

Browse source 
svn path=/trunk/; revision=9585
This commit is contained in:
Steven Edwards 2004-06-01 19:06:50 +00:00
parent f95308afa8
commit 73888a7753
2 changed files with 3 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/Makefile
View file

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.223 2004/05/31 19:45:16 gdalsnes Exp $ # $Id: Makefile,v 1.224 2004/06/01 19:06:50 sedwards Exp $
# #
# Global makefile # Global makefile
# #
@ -32,7 +32,7 @@ BUS = acpi isapnp pci
LIB_FSLIB = vfatlib LIB_FSLIB = vfatlib
# Static libraries # Static libraries
LIB_STATIC = string rosrtl epsapi uuid libwine zlib rtl LIB_STATIC = string rosrtl epsapi uuid libwine zlib rtl tgetopt
# Keyboard layout libraries # Keyboard layout libraries
DLLS_KBD = kbdus kbdgr kbdfr kbduk DLLS_KBD = kbdus kbdgr kbdfr kbduk

19
reactos/subsys/system/vmwinst/vmwinst.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: vmwinst.c,v 1.3 2004/04/12 16:14:54 weiden Exp $ /* $Id: vmwinst.c,v 1.4 2004/06/01 19:06:50 sedwards Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS VMware(r) driver installation utility * PROJECT: ReactOS VMware(r) driver installation utility
@ -56,24 +56,7 @@ LONG WINAPI ExceptionHandler(LPEXCEPTION_POINTERS ExceptionInfo)
BOOL BOOL
DetectVMware(int *Version) DetectVMware(int *Version)
{ {
int magic, ver;
magic = 0;
ver = 0;
/* Try using a VMware I/O port. If not running in VMware this'll throw an
exception! */
__asm__ __volatile__("inl %%dx, %%eax"
: "=a" (ver), "=b" (magic)
: "0" (0x564d5868), "d" (0x5658), "c" (0xa));
if(magic == 0x564d5868)
{
*Version = ver;
return TRUE; return TRUE;
}
return FALSE;
} }
BOOL BOOL