jetomit/avp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed Watcom Compiler support.

Browse source
This commit is contained in:
Steven Fuller 2008-05-18 21:32:34 -07:00 • committed by Patryk Obara
parent 02db356511
commit c948a59391
20 changed files with 19 additions and 1480 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/avp/missions.hpp
View file

@ -7,7 +7,7 @@
#ifndef _missions #ifndef _missions
#define _missions 1 #define _missions 1
#if ( defined( __WATCOMC__ ) || defined( _MSC_VER ) ) #if defined( _MSC_VER )
#pragma once #pragma once
#endif #endif

2
src/avp/support/consbind.hpp
View file

@ -11,7 +11,7 @@
#ifndef _consbind_hpp #ifndef _consbind_hpp
#define _consbind_hpp 1 #define _consbind_hpp 1
#if ( defined( __WATCOMC__ ) || defined( _MSC_VER ) ) #if defined( _MSC_VER )
#pragma once #pragma once
#endif #endif

2
src/avp/support/consbtch.hpp
View file

@ -9,7 +9,7 @@
#ifndef _consbtch #ifndef _consbtch
#define _consbtch 1 #define _consbtch 1
#if ( defined( __WATCOMC__ ) || defined( _MSC_VER ) ) #if defined( _MSC_VER )
#pragma once #pragma once
#endif #endif

2
src/avp/support/dcontext.hpp
View file

@ -19,7 +19,7 @@
#ifndef _dcontext #ifndef _dcontext
#define _dcontext 1 #define _dcontext 1
#if ( defined( __WATCOMC__ ) || defined( _MSC_VER ) ) #if defined( _MSC_VER )
#pragma once #pragma once
#endif #endif

2
src/avp/support/reflist.hpp
View file

@ -29,7 +29,7 @@
#ifndef _reflist_hpp #ifndef _reflist_hpp
#define _reflist_hpp 1 #define _reflist_hpp 1
#if ( defined( __WATCOMC__ ) || defined( _MSC_VER ) ) #if defined( _MSC_VER )
#pragma once #pragma once
#endif #endif

2
src/avp/support/tallfont.hpp
View file

@ -7,7 +7,7 @@
#ifndef _tallfont #ifndef _tallfont
#define _tallfont 1 #define _tallfont 1
#if ( defined( __WATCOMC__ ) || defined( _MSC_VER ) ) #if defined( _MSC_VER )
#pragma once #pragma once
#endif #endif

2
src/avp/support/wrapstr.hpp
View file

@ -20,7 +20,7 @@
#ifndef _wrapstr_hpp #ifndef _wrapstr_hpp
#define _wrapstr_hpp 1 #define _wrapstr_hpp 1
#if ( defined( __WATCOMC__ ) || defined( _MSC_VER ) ) #if defined( _MSC_VER )
#pragma once #pragma once
#endif #endif

2
src/avp/win95/gadgets/conscmnd.hpp
View file

@ -7,7 +7,7 @@
#ifndef _conscmnd #ifndef _conscmnd
#define _conscmnd 1 #define _conscmnd 1
#if ( defined( __WATCOMC__ ) || defined( _MSC_VER ) ) #if defined( _MSC_VER )
#pragma once #pragma once
#endif #endif

2
src/avp/win95/gadgets/conssym.hpp
View file

@ -11,7 +11,7 @@
#ifndef _conssym_hpp #ifndef _conssym_hpp
#define _conssym_hpp 1 #define _conssym_hpp 1
#if ( defined( __WATCOMC__ ) || defined( _MSC_VER ) ) #if defined( _MSC_VER )
#pragma once #pragma once
#endif #endif

2
src/avp/win95/gadgets/consvar.hpp
View file

@ -9,7 +9,7 @@
#ifndef _consvar_hpp #ifndef _consvar_hpp
#define _consvar_hpp 1 #define _consvar_hpp 1
#if ( defined( __WATCOMC__ ) || defined( _MSC_VER ) ) #if defined( _MSC_VER )
#pragma once #pragma once
#endif #endif

6
src/win95/d3_func.cpp
View file

@ -98,12 +98,6 @@ static unsigned char DefaultD3DTextureFilterMax;
#if SuppressWarnings #if SuppressWarnings
static int* itemptr_tmp; static int* itemptr_tmp;
#ifdef __WATCOMC__
#pragma warning 389 5
#pragma message("Note: Disabled Warning W389 'Integral value may be truncated...'")
#endif
#endif #endif

4
src/win95/dxlog.c
View file

@ -278,11 +278,7 @@ D3DAppErrorToString(HRESULT error)
} }
} }
#ifdef __WATCOMC__
#define LOGFILE_NAME "dx_error.log"
#else
#define LOGFILE_NAME "dx_errorM.log" #define LOGFILE_NAME "dx_errorM.log"
#endif
static LOGFILE * dxlog = 0; static LOGFILE * dxlog = 0;
static int closed_once = 0; static int closed_once = 0;

9
src/win95/hash_tem.hpp
View file

@ -839,17 +839,8 @@ template <class TYPE> class HashTable;
#define HT_WATCOM_DEFINE_FOR_SIMPLE_TYPE(TYPE) \ #define HT_WATCOM_DEFINE_FOR_SIMPLE_TYPE(TYPE) \
class HashTable<TYPE> HT_DEFINITION(TYPE,TYPE,TYPE) class HashTable<TYPE> HT_DEFINITION(TYPE,TYPE,TYPE)
#ifdef __WATCOMC__
//watcom generartes errors if template<> is added to the start of the line - Richard.
#define HT_DEFINE_FOR_SIMPLE_TYPE(SIMPLE_TYPE) HT_WATCOM_DEFINE_FOR_SIMPLE_TYPE(SIMPLE_TYPE)
#else
#define HT_DEFINE_FOR_SIMPLE_TYPE(SIMPLE_TYPE) template<> HT_WATCOM_DEFINE_FOR_SIMPLE_TYPE(SIMPLE_TYPE) #define HT_DEFINE_FOR_SIMPLE_TYPE(SIMPLE_TYPE) template<> HT_WATCOM_DEFINE_FOR_SIMPLE_TYPE(SIMPLE_TYPE)
#endif
HT_DEFINE_FOR_SIMPLE_TYPE(unsigned long) HT_DEFINE_FOR_SIMPLE_TYPE(unsigned long)
HT_DEFINE_FOR_SIMPLE_TYPE(signed long) HT_DEFINE_FOR_SIMPLE_TYPE(signed long)
HT_DEFINE_FOR_SIMPLE_TYPE(unsigned) HT_DEFINE_FOR_SIMPLE_TYPE(unsigned)

1276
src/win95/inline.h
View file

File diff suppressed because it is too large Load diff

10
src/win95/list_tem.hpp
View file

@ -100,24 +100,16 @@ struct List_Member_Base
union union
{ {
List_Member_Base<T> *prev; List_Member_Base<T> *prev;
#ifndef __WATCOMC__
List_Member<T> *prev_debug; // encourage the debugger to display the list members data List_Member<T> *prev_debug; // encourage the debugger to display the list members data
#endif // hopefully casting from base to derived class would not // hopefully casting from base to derived class would not
// cause the actual value of the ptr to change, so the debugger // cause the actual value of the ptr to change, so the debugger
// will display the information correctly, and this union // will display the information correctly, and this union
// won't cause any kind of performance hit // won't cause any kind of performance hit
//watcom doesn't appear to like this, unfortunately.
}; };
union union
{ {
List_Member_Base<T> *next; List_Member_Base<T> *next;
#ifndef __WATCOMC__
List_Member<T> *next_debug; List_Member<T> *next_debug;
#endif
}; };
virtual ~List_Member_Base() {} virtual ~List_Member_Base() {}
}; };

29
src/win95/media.hpp
View file

@ -1,12 +1,6 @@
#ifndef _INCLUDED_MEDIA_HPP_ #ifndef _INCLUDED_MEDIA_HPP_
#define _INCLUDED_MEDIA_HPP_ #define _INCLUDED_MEDIA_HPP_
//#if defined(_WIN32) || defined(WIN32) || defined(WINDOWS) || defined(_WINDOWS)
// #define _MEDIA_WIN_TARGET
// #include <windows.h>
//#endif // WIN32 || _WIN32 || WINDOWS || _WINDOWS
#include <stdio.h> #include <stdio.h>
#include <limits.h> #include <limits.h>
#include <string.h> #include <string.h>
@ -29,10 +23,6 @@ void MediaRead(MediaMedium * pThis, TYPE * p);
template <class TYPE> template <class TYPE>
void MediaWrite(MediaMedium * pThis, TYPE d); void MediaWrite(MediaMedium * pThis, TYPE d);
#ifdef __WATCOMC__
template <class TYPE> class _Media_CompilerHack;
#endif
class MediaMedium class MediaMedium
{ {
protected: protected:
@ -284,15 +274,10 @@ class MediaMedium
friend class _Media_CompilerHack; friend class _Media_CompilerHack;
}; };
#ifdef __WATCOMC__
template <class TYPE>
#endif
class _Media_CompilerHack class _Media_CompilerHack
{ {
public: public:
#ifndef __WATCOMC__
template <class TYPE> template <class TYPE>
#endif
static inline void MediaRead(MediaMedium * pThis, TYPE * p) static inline void MediaRead(MediaMedium * pThis, TYPE * p)
{ {
if (pThis->m_nReadBufPos + sizeof(TYPE) <= pThis->m_nBufSize) if (pThis->m_nReadBufPos + sizeof(TYPE) <= pThis->m_nBufSize)
@ -317,9 +302,7 @@ class _Media_CompilerHack
} }
} }
#ifndef __WATCOMC__
template <class TYPE> template <class TYPE>
#endif
static inline void MediaWrite(MediaMedium * pThis, TYPE d) static inline void MediaWrite(MediaMedium * pThis, TYPE d)
{ {
if (pThis->m_nWriteBufPos + sizeof(TYPE) <= pThis->m_nBufSize) if (pThis->m_nWriteBufPos + sizeof(TYPE) <= pThis->m_nBufSize)
@ -353,11 +336,7 @@ class _Media_CompilerHack
template <class TYPE> template <class TYPE>
inline void MediaRead(MediaMedium * pThis, TYPE * p) inline void MediaRead(MediaMedium * pThis, TYPE * p)
{ {
_Media_CompilerHack _Media_CompilerHack::MediaRead(pThis,p);
#ifdef __WATCOMC__
<TYPE>
#endif
::MediaRead(pThis,p);
} }
// use this to write simple data types // use this to write simple data types
@ -368,11 +347,7 @@ inline void MediaRead(MediaMedium * pThis, TYPE * p)
template <class TYPE> template <class TYPE>
inline void MediaWrite(MediaMedium * pThis, TYPE d) inline void MediaWrite(MediaMedium * pThis, TYPE d)
{ {
_Media_CompilerHack _Media_CompilerHack::MediaWrite(pThis,d);
#ifdef __WATCOMC__
<TYPE>
#endif
::MediaWrite(pThis,d);
} }
#ifdef _MEDIA_WIN_TARGET #ifdef _MEDIA_WIN_TARGET

125
src/win95/mmx_math.h
View file

@ -87,16 +87,7 @@ extern void MMXAsm_VectorDot(void);
extern void MMXAsm_VectorDot16(void); extern void MMXAsm_VectorDot16(void);
/* inline calls to MMX functions with correct parameters set */ /* inline calls to MMX functions with correct parameters set */
#ifdef __WATCOMC__ #if defined(_MSC_VER)
#pragma aux MMX_VectorTransform = "call MMXAsm_VectorTransform" parm [eax] [edx];
#pragma aux MMX_VectorTransformed = "call MMXAsm_VectorTransformed" parm [eax] [edx] [ecx];
#pragma aux MMX_VectorTransformAndAdd = "call MMXAsm_VectorTransformAndAdd" parm [eax] [edx] [ecx];
#pragma aux MMX_VectorTransformedAndAdd = "call MMXAsm_VectorTransformedAndAdd" parm [eax] [edx] [ecx] [ebx];
#pragma aux MMX_VectorDot = "call MMXAsm_VectorDot" parm [eax] [edx] value [eax];
#pragma aux MMX_VectorDot16 = "call MMXAsm_VectorDot16" parm [eax] [edx] value [eax];
#elif defined(_MSC_VER)
_asmcall void MMX_VectorTransform(struct vectorch * vector, struct matrixch const * matrix) _asmcall void MMX_VectorTransform(struct vectorch * vector, struct matrixch const * matrix)
{ {
@ -187,119 +178,7 @@ extern int use_mmx_math;
extern const __int64 mmx_sign_mask; extern const __int64 mmx_sign_mask;
extern const __int64 mmx_one_fixed_h; extern const __int64 mmx_one_fixed_h;
#ifdef __WATCOMC__ #if defined(_MSC_VER)
#pragma aux MMXInline_VectorDot = \
\
" movq mm0,[edx]" \
\
" movd mm2,[edx+08h]" \
" movq mm4,mm0" \
\
" pand mm4,mmx_sign_mask" \
" movq mm6,mm2" \
\
" movq mm1,[eax]" \
" paddd mm4,mm4" \
\
" movd mm3,[eax+08h]" \
" movq mm5,mm1" \
\
" pand mm6,mmx_sign_mask" \
" movq mm7,mm3" \
\
" pand mm5,mmx_sign_mask" \
" paddd mm6,mm6" \
\
" pand mm7,mmx_sign_mask" \
" paddd mm5,mm5" \
\
" paddd mm0,mm4" \
" paddd mm2,mm6" \
\
" paddd mm7,mm7" \
" movq mm4,mm2" \
\
" punpcklwd mm4,mm0" \
" paddd mm1,mm5" \
\
" punpckhwd mm2,mm0" \
" paddd mm3,mm7" \
\
" movq mm5,mm3" \
" punpckhwd mm3,mm1" \
\
" punpcklwd mm5,mm1" \
" movq mm0,mm2" \
\
" movq mm1,mm4" \
" pmaddwd mm0,mm3" \
\
" movq mm6,mm3" \
" psrlq mm3,32" \
\
" movq mm7,mm5" \
" punpckldq mm3,mm6" \
\
" pmaddwd mm1,mm5" \
" psrlq mm5,32" \
\
" punpckldq mm5,mm7" \
" pmaddwd mm2,mm3" \
\
" pmaddwd mm4,mm5" \
" movq mm3,mm0" \
\
" punpckldq mm0,mm1" \
\
" psubd mm0,mmx_one_fixed_h" \
" punpckhdq mm1,mm3" \
\
" psrad mm0,16" \
" paddd mm2,mm4" \
\
" pslld mm1,16" \
" paddd mm2,mm0" \
\
" paddd mm2,mm1" \
\
" movq mm1,mm2" \
" psrlq mm2,32" \
\
" paddd mm1,mm2" \
\
" movd eax,mm1" \
\
" emms" \
\
" inc eax" \
\
parm [eax] [edx] value [eax];
#pragma aux MMXInline_VectorDot16 = \
\
" movd mm0,[edx+08h]" \
\
" packssdw mm0,[edx]" \
\
" movd mm1,[eax+08h]" \
\
" packssdw mm1,[eax]" \
\
" pmaddwd mm0,mm1" \
\
" movq mm1,mm0" \
" psrlq mm0,32" \
\
" paddd mm0,mm1" \
\
" movd eax,mm0" \
\
" emms" \
\
parm [eax] [edx] value [eax];
#elif defined(_MSC_VER)
_asminline signed MMXInline_VectorDot(struct vectorch const * v1, struct vectorch const * v2) _asminline signed MMXInline_VectorDot(struct vectorch const * v1, struct vectorch const * v2)
{ {

5
src/win95/plspecfn.c
View file

@ -486,8 +486,6 @@ void ShapePointsInstr(SHAPEINSTR *shapeinstrptr)
together, divides the summed product with another integer and then returns together, divides the summed product with another integer and then returns
the result of that divide, which is also an integer. the result of that divide, which is also an integer.
It is not inlined for Watcom C, although the functions it calls ARE.
*/ */
int WideMul2NarrowDiv(int a, int b, int c, int d, int e) int WideMul2NarrowDiv(int a, int b, int c, int d, int e)
@ -1109,9 +1107,6 @@ void MaxLONGLONGCH(LONGLONGCH *llarrayptr, int llarraysize, LONGLONGCH *llmax)
Some operators derived from the 64-bit CMP function. Some operators derived from the 64-bit CMP function.
These were first defined for pcwatcom\plspecfn.h and transferred as and
when needed to other platforms.
*/ */

6
src/win95/string.hpp
View file

@ -1,10 +1,6 @@
#ifndef _included_string_hpp_ #ifndef _included_string_hpp_
#define _included_string_hpp_ #define _included_string_hpp_
#ifdef __WATCOMC__
#include <string.hpp>
#else
#ifndef __cplusplus #ifndef __cplusplus
#error "string.hpp requires C++ compilation" #error "string.hpp requires C++ compilation"
#endif #endif
@ -179,5 +175,3 @@ inline int valid(String const & str)
} }
#endif #endif
#endif

7
src/win95/win_func.cpp
View file

@ -253,12 +253,7 @@ BOOL WaitForRasterThread()
mssetup api mssetup api
*/ */
#ifdef __WATCOMC__ #if defined(_MSC_VER)
unsigned int GetCPUId(void);
#pragma aux GetCPUId = "mov eax,1" "cpuid" value [edx] modify [eax ebx ecx];
#elif defined(_MSC_VER)
static unsigned int GetCPUId(void) static unsigned int GetCPUId(void)
{ {