Another file now compiles.
This commit is contained in:
parent
8b4a564235
commit
fd8ed25d23
3 changed files with 11 additions and 6 deletions
6
Makefile
6
Makefile
|
@ -1,7 +1,7 @@
|
||||||
CC = gcc
|
CC = gcc
|
||||||
NASM = nasm
|
NASM = nasm
|
||||||
|
|
||||||
CFLAGS = -g -Wall -Iinclude -Iwin95 -Iavp -Iavp/win95 -Iavp/support -Iavp/win95/frontend
|
CFLAGS = -g -Wall -I. -Iinclude -Iwin95 -Iavp -Iavp/win95 -Iavp/support -Iavp/win95/frontend
|
||||||
CXXFLAGS = $(CFLAGS)
|
CXXFLAGS = $(CFLAGS)
|
||||||
LDLIBS = -lm # /home/relnev/ElectricFence-2.2.2/libefence.a
|
LDLIBS = -lm # /home/relnev/ElectricFence-2.2.2/libefence.a
|
||||||
|
|
||||||
|
@ -11,8 +11,8 @@ LDLIBS += `sdl-config --libs`
|
||||||
AFLAGS = -g -Iinclude/ -w+macro-params -w+orphan-labels -w+number-overflow
|
AFLAGS = -g -Iinclude/ -w+macro-params -w+orphan-labels -w+number-overflow
|
||||||
|
|
||||||
ROOT = afont.c frustum.c kshape.c map.c maths.c mem3dc.c mem3dcpp.cpp module.c morph.c mslhand.c object.c shpanim.c sphere.c tables.c vdb.c version.c
|
ROOT = afont.c frustum.c kshape.c map.c maths.c mem3dc.c mem3dcpp.cpp module.c morph.c mslhand.c object.c shpanim.c sphere.c tables.c vdb.c version.c
|
||||||
AVP = ai_sight.c
|
AVP = ai_sight.c avpview.c
|
||||||
# avpitems.cpp
|
# avpitems.cpp avppages.cpp
|
||||||
|
|
||||||
# the following should really be autogenerated...
|
# the following should really be autogenerated...
|
||||||
|
|
||||||
|
|
|
@ -10,13 +10,12 @@
|
||||||
|
|
||||||
#include "kshape.h"
|
#include "kshape.h"
|
||||||
#include "kzsort.h"
|
#include "kzsort.h"
|
||||||
#include "frustrum.h"
|
#include "frustum.h"
|
||||||
#include "krender.h"
|
#include "krender.h"
|
||||||
#include "vision.h"
|
#include "vision.h"
|
||||||
#include "lighting.h"
|
#include "lighting.h"
|
||||||
#include "weapons.h"
|
#include "weapons.h"
|
||||||
#include "sfx.h"
|
#include "sfx.h"
|
||||||
#include "smacker.h"
|
|
||||||
/* character extents data so you know where the player's eyes are */
|
/* character extents data so you know where the player's eyes are */
|
||||||
#include "extents.h"
|
#include "extents.h"
|
||||||
#include "avp_userprofile.h"
|
#include "avp_userprofile.h"
|
||||||
|
@ -43,7 +42,8 @@ extern int ScanDrawMode;
|
||||||
extern int DrawMode;
|
extern int DrawMode;
|
||||||
extern int ZBufferMode;
|
extern int ZBufferMode;
|
||||||
|
|
||||||
extern DPID MultiplayerObservedPlayer;
|
//extern DPID MultiplayerObservedPlayer;
|
||||||
|
extern int MultiplayerObservedPlayer;
|
||||||
|
|
||||||
#if SupportMorphing
|
#if SupportMorphing
|
||||||
MORPHDISPLAY MorphDisplay;
|
MORPHDISPLAY MorphDisplay;
|
||||||
|
|
|
@ -33,8 +33,13 @@ extern "C" {
|
||||||
#define max(a, b) (((a) > (b)) ? (a) : (b))
|
#define max(a, b) (((a) > (b)) ? (a) : (b))
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#define stricmp strcasecmp
|
||||||
|
|
||||||
/* Types */
|
/* Types */
|
||||||
|
|
||||||
|
typedef int GUID;
|
||||||
|
typedef int DPID;
|
||||||
|
|
||||||
typedef int BOOL;
|
typedef int BOOL;
|
||||||
|
|
||||||
typedef struct RECT
|
typedef struct RECT
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue