pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated OS/2 build, yay!

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401446
This commit is contained in:
Sam Lantinga 2006-02-26 19:30:21 +00:00
parent e1f2aca17a
commit 46f459a736
32 changed files with 727 additions and 675 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/cpuinfo/Makefile.wat
View file

@ -1,27 +0,0 @@
#=============================================================================
# This is a Watcom makefile to build SDL.DLL for OS/2
#
# Makefile for cpuinfo
#=============================================================================
object_files=SDL_cpuinfo.obj
# We have to define the following so the assembly parts can be
# compiled by Watcom, too!
ExtraCFlags=-d_MSC_VER
#
#==============================================================================
#
!include ..\..\Watcom.mif
.before
set include=$(%os2tk)\h;$(%include);../../include
all : $(object_files)
clean : .SYMBOLIC
@if exist *.obj del *.obj
@if exist *.map del *.map
@if exist *.res del *.res
@if exist *.lst del *.lst

6
src/cpuinfo/SDL_cpuinfo.c
View file

@ -96,7 +96,7 @@ CPUid by definition. But it's nice to be able to prove it. :) */
:
: "%rax", "%rcx"
);
#elif defined(_MSC_VER) && (defined(_M_IX86) || defined(_X86_))
#elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)
__asm {
pushfd ; Get original EFLAGS
pop eax
@ -165,7 +165,7 @@ static __inline__ int CPU_getCPUIDFeatures(void)
:
: "%eax", "%ecx", "%edx", "%edi"
);
#elif defined(_MSC_VER) && (defined(_M_IX86) || defined(_X86_))
#elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)
__asm {
xor eax, eax ; Set up for CPUID instruction
cpuid ; Get and save vendor ID
@ -217,7 +217,7 @@ static __inline__ int CPU_getCPUIDFeaturesExt(void)
:
: "%eax", "%ecx", "%edx", "%edi"
);
#elif defined(_MSC_VER) && (defined(_M_IX86) || defined(_X86_))
#elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)
__asm {
mov eax,80000000h ; Query for extended functions
cpuid ; Get extended function limit