More compiling...

This commit is contained in:
Steven Fuller 2001-07-28 01:21:46 +00:00 committed by Patryk Obara
parent fd8ed25d23
commit 6d5a3cec55
40 changed files with 98 additions and 74 deletions

View file

@ -1,7 +1,7 @@
CC = gcc CC = gcc
NASM = nasm NASM = nasm
CFLAGS = -g -Wall -I. -Iinclude -Iwin95 -Iavp -Iavp/win95 -Iavp/support -Iavp/win95/frontend CFLAGS = -g -Wall -I. -Iinclude -Iwin95 -Iavp -Iavp/win95 -Iavp/support -Iavp/win95/frontend -Iavp/win95/gadgets
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,10 @@ 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 avpview.c AVP = ai_sight.c avpview.c bh_agun.c bh_ais.c bh_alien.c bh_binsw.c bh_cable.c bh_corpse.c bh_deathvol.c bh_debri.c bh_dummy.c bh_fan.c bh_far.c bh_fhug.c bh_gener.c bh_ldoor.c bh_lift.c bh_light.c bh_lnksw.c bh_ltfx.c bh_marin.c bh_mission.c bh_near.c bh_pargen.c bh_plachier.c bh_plift.c bh_pred.c bh_queen.c bh_rubberduck.c bh_selfdest.c bh_snds.c bh_spcl.c bh_swdor.c bh_track.c bh_types.c bh_videoscreen.c bh_waypt.c bh_weap.c bh_xeno.c bonusabilities.c cheatmodes.c comp_map.c comp_shp.c consolelog.cpp deaths.c decal.c detaillevels.c dynamics.c dynblock.c equipmnt.c equiputl.cpp extents.c game.c gameflow.c hmodel.c hud.c inventry.c language.c lighting.c load_shp.c los.c maps.c mempool.c messagehistory.c movement.c paintball.c particle.c pfarlocs.c pheromon.c pmove.c psndproj.c pvisible.c
# avpitems.cpp avppages.cpp # unused?: avpitems.cpp avppages.cpp
# not needed: mp_launch.c
# need fix: cconvars.cpp cdtrackselection.cpp davehook.cpp game_statistics.c gamecmds.cpp gamevars.cpp missions.cpp player.c psnd.c
# the following should really be autogenerated... # the following should really be autogenerated...

View file

@ -38,10 +38,10 @@
#include "bh_agun.h" #include "bh_agun.h"
#include "plat_shp.h" #include "plat_shp.h"
#include "psnd.h" #include "psnd.h"
#include "AI_Sight.h" #include "ai_sight.h"
#include "sequnces.h" #include "sequnces.h"
#include "huddefs.h" #include "huddefs.h"
#include "ShowCmds.h" #include "showcmds.h"
#include "sfx.h" #include "sfx.h"
#include "bh_marin.h" #include "bh_marin.h"
#include "bh_far.h" #include "bh_far.h"

View file

@ -26,10 +26,10 @@
#include "psnd.h" #include "psnd.h"
#include "equipmnt.h" #include "equipmnt.h"
#include "los.h" #include "los.h"
#include "AI_Sight.h" #include "ai_sight.h"
#include "targeting.h" #include "targeting.h"
#include "dxlog.h" #include "dxlog.h"
#include "ShowCmds.h" #include "showcmds.h"
#include "huddefs.h" #include "huddefs.h"
#define UseLocalAssert Yes #define UseLocalAssert Yes

View file

@ -36,7 +36,7 @@
#define UseLocalAssert Yes #define UseLocalAssert Yes
#include "ourasert.h" #include "ourasert.h"
#include "pldnet.h" #include "pldnet.h"
#include "AvP_UserProfile.h" #include "avp_userprofile.h"
/* external global variables used in this file */ /* external global variables used in this file */
extern int ModuleArraySize; extern int ModuleArraySize;

View file

@ -32,7 +32,7 @@
#include "pldghost.h" #include "pldghost.h"
#include "pldnet.h" #include "pldnet.h"
#include "psndplat.h" #include "psndplat.h"
#include "AI_Sight.h" #include "ai_sight.h"
#include "los.h" #include "los.h"
#include "bh_corpse.h" #include "bh_corpse.h"
@ -42,7 +42,7 @@
#include "ourasert.h" #include "ourasert.h"
#include "sequnces.h" #include "sequnces.h"
#include "ShowCmds.h" #include "showcmds.h"
#include "extents.h" #include "extents.h"
extern int NormalFrameTime; extern int NormalFrameTime;

View file

@ -32,7 +32,7 @@
#include "pldghost.h" #include "pldghost.h"
#endif #endif
#include "AvP_UserProfile.h" #include "avp_userprofile.h"
#include "savegame.h" #include "savegame.h"
#include <math.h> #include <math.h>

View file

@ -36,10 +36,10 @@
#include "bh_agun.h" #include "bh_agun.h"
#include "plat_shp.h" #include "plat_shp.h"
#include "psnd.h" #include "psnd.h"
#include "AI_Sight.h" #include "ai_sight.h"
#include "sequnces.h" #include "sequnces.h"
#include "huddefs.h" #include "huddefs.h"
#include "ShowCmds.h" #include "showcmds.h"
#include "sfx.h" #include "sfx.h"
#include "bh_marin.h" #include "bh_marin.h"
#include "bh_dummy.h" #include "bh_dummy.h"

View file

@ -22,7 +22,7 @@
#include "pvisible.h" #include "pvisible.h"
#include "bh_marin.h" #include "bh_marin.h"
#include "weapons.h" #include "weapons.h"
#include "ShowCmds.h" #include "showcmds.h"
#define UseLocalAssert Yes #define UseLocalAssert Yes
#include "ourasert.h" #include "ourasert.h"

View file

@ -23,7 +23,7 @@
#define UseLocalAssert Yes #define UseLocalAssert Yes
#include "ourasert.h" #include "ourasert.h"
#include "ShowCmds.h" #include "showcmds.h"
#include "sfx.h" #include "sfx.h"
#define HUGGER_STATE_PRINT 0 #define HUGGER_STATE_PRINT 0

View file

@ -23,7 +23,7 @@
#include "ourasert.h" #include "ourasert.h"
#include "huddefs.h" #include "huddefs.h"
#include "ShowCmds.h" #include "showcmds.h"
/* externs for this file */ /* externs for this file */
extern int NormalFrameTime; extern int NormalFrameTime;

View file

@ -33,7 +33,7 @@
#include "pldghost.h" #include "pldghost.h"
#include "pldnet.h" #include "pldnet.h"
#include "psndplat.h" #include "psndplat.h"
#include "AI_Sight.h" #include "ai_sight.h"
#include "los.h" #include "los.h"
#include "bh_corpse.h" #include "bh_corpse.h"
#include "bh_dummy.h" #include "bh_dummy.h"
@ -45,9 +45,9 @@
#include "ourasert.h" #include "ourasert.h"
#include "sequnces.h" #include "sequnces.h"
#include "ShowCmds.h" #include "showcmds.h"
#include "extents.h" #include "extents.h"
#include "AvP_UserProfile.h" #include "avp_userprofile.h"
#define ALL_PULSERIFLES 0 #define ALL_PULSERIFLES 0
#define MOTIONTRACKERS 0 #define MOTIONTRACKERS 0

View file

@ -24,8 +24,8 @@
#include "psnd.h" #include "psnd.h"
#include "psndplat.h" #include "psndplat.h"
#include "dxlog.h" #include "dxlog.h"
#include "ShowCmds.h" #include "showcmds.h"
#include "AI_Sight.h" #include "ai_sight.h"
#include "los.h" #include "los.h"
#include "bh_gener.h" #include "bh_gener.h"
#include "pldnet.h" #include "pldnet.h"

View file

@ -26,10 +26,10 @@ Source file for predator AI
#include "psnd.h" #include "psnd.h"
#include "equipmnt.h" #include "equipmnt.h"
#include "los.h" #include "los.h"
#include "AI_Sight.h" #include "ai_sight.h"
#include "targeting.h" #include "targeting.h"
#include "dxlog.h" #include "dxlog.h"
#include "ShowCmds.h" #include "showcmds.h"
#include "huddefs.h" #include "huddefs.h"
#include "pldghost.h" #include "pldghost.h"
#include "bh_gener.h" #include "bh_gener.h"

View file

@ -26,7 +26,7 @@
#include "weapons.h" #include "weapons.h"
#include "extents.h" #include "extents.h"
#include "sequnces.h" #include "sequnces.h"
#include "ShowCmds.h" #include "showcmds.h"
#include "targeting.h" #include "targeting.h"
#include "dxlog.h" #include "dxlog.h"
#include <math.h> #include <math.h>

View file

@ -18,7 +18,7 @@
#include "particle.h" #include "particle.h"
#include "bh_types.h" #include "bh_types.h"
#include "bh_RubberDuck.h" #include "bh_rubberduck.h"
#include "bh_weap.h" #include "bh_weap.h"
#include "sfx.h" #include "sfx.h"

View file

@ -31,10 +31,10 @@
#include "particle.h" #include "particle.h"
#include "sfx.h" #include "sfx.h"
#include "ShowCmds.h" #include "showcmds.h"
#include "savegame.h" #include "savegame.h"
#include "los.h" #include "los.h"
#include "DetailLevels.h" #include "detaillevels.h"
#if SupportWindows95 #if SupportWindows95
/* for win95 net game support */ /* for win95 net game support */

View file

@ -24,10 +24,10 @@
#include "bh_debri.h" #include "bh_debri.h"
#include "plat_shp.h" #include "plat_shp.h"
#include "particle.h" #include "particle.h"
#include "AI_Sight.h" #include "ai_sight.h"
#include "sequnces.h" #include "sequnces.h"
#include "huddefs.h" #include "huddefs.h"
#include "ShowCmds.h" #include "showcmds.h"
#include "sfx.h" #include "sfx.h"
#include "bh_marin.h" #include "bh_marin.h"
#include "bh_far.h" #include "bh_far.h"

View file

@ -27,15 +27,15 @@
#include "dxlog.h" #include "dxlog.h"
#include "avp_menus.h" #include "avp_menus.h"
#include "pheromon.h" #include "pheromon.h"
#include "ShowCmds.h" #include "showcmds.h"
#include "pfarlocs.h" #include "pfarlocs.h"
#define UseLocalAssert Yes #define UseLocalAssert Yes
#include "ourasert.h" #include "ourasert.h"
#include "game_statistics.h" #include "game_statistics.h"
#include "AvP_EnvInfo.h" #include "avp_envinfo.h"
#include "AvP_UserProfile.h" #include "avp_userprofile.h"
extern "C" extern "C"
{ {

View file

@ -4,11 +4,11 @@ extern "C"
#include "ourasert.h" #include "ourasert.h"
#include "psndplat.h" #include "psndplat.h"
#include "dxlog.h" #include "dxlog.h"
#include "CD_player.h" #include "cd_player.h"
#include "avp_menus.h" #include "avp_menus.h"
#include "gamedef.h" #include "gamedef.h"
#include "AvP_EnvInfo.h" #include "avp_envinfo.h"
#include "dxlog.h" #include "dxlog.h"
}; };

View file

@ -3,8 +3,8 @@
#include "module.h" #include "module.h"
#include "stratdef.h" #include "stratdef.h"
#include "AvP_UserProfile.h" #include "avp_userprofile.h"
#include "AvP_Menus.h" #include "avp_menus.h"
int CheatMode_Active=0; int CheatMode_Active=0;
int CheatMode_Species=0; int CheatMode_Species=0;

View file

@ -15,7 +15,7 @@
#include "gameplat.h" #include "gameplat.h"
#include "debuglog.hpp" #include "debuglog.hpp"
#include "ConsoleLog.hpp" #include "consolelog.hpp"
#include "bh_types.h" #include "bh_types.h"
#include "inventry.h" #include "inventry.h"

View file

@ -25,10 +25,10 @@
#include "psnd.h" #include "psnd.h"
#include "equipmnt.h" #include "equipmnt.h"
#include "los.h" #include "los.h"
#include "AI_Sight.h" #include "ai_sight.h"
#include "targeting.h" #include "targeting.h"
#include "dxlog.h" #include "dxlog.h"
#include "ShowCmds.h" #include "showcmds.h"
#define UseLocalAssert Yes #define UseLocalAssert Yes
#include "ourasert.h" #include "ourasert.h"

View file

@ -1,4 +1,4 @@
#include "DetailLevels.h" #include "detaillevels.h"
DETAIL_LEVELS LocalDetailLevels; DETAIL_LEVELS LocalDetailLevels;
MENU_DETAIL_LEVEL_OPTIONS MenuDetailLevelOptions; MENU_DETAIL_LEVEL_OPTIONS MenuDetailLevelOptions;

View file

@ -23,13 +23,13 @@
#include "particle.h" #include "particle.h"
#include "sfx.h" #include "sfx.h"
#include "version.h" #include "version.h"
#include "bh_RubberDuck.h" #include "bh_rubberduck.h"
#include "bh_marin.h" #include "bh_marin.h"
#include "dxlog.h" #include "dxlog.h"
#include "avp_menus.h" #include "avp_menus.h"
#include "avp_userprofile.h" #include "avp_userprofile.h"
#include "davehook.h" #include "davehook.h"
#include "CDTrackSelection.h" #include "cdtrackselection.h"
#include "savegame.h" #include "savegame.h"
// Added 18/11/97 by DHM: all hooks for my code // Added 18/11/97 by DHM: all hooks for my code

View file

@ -16,8 +16,8 @@
#define UseLocalAssert Yes #define UseLocalAssert Yes
#include "ourasert.h" #include "ourasert.h"
#include "AvP_EnvInfo.h" #include "avp_envinfo.h"
#include "AvP_UserProfile.h" #include "avp_userprofile.h"
#define FIXED_MINUTE (ONE_FIXED*60) #define FIXED_MINUTE (ONE_FIXED*60)

View file

@ -29,17 +29,16 @@ extern "C"
#include "cheat.h" #include "cheat.h"
#include "cd_player.h" #include "cd_player.h"
#include "dynblock.h" #include "dynblock.h"
#include "bh_RubberDuck.h" #include "bh_rubberduck.h"
#include "pvisible.h" #include "pvisible.h"
#include "pldnet.h" #include "pldnet.h"
#include "lighting.h" #include "lighting.h"
#include "paintball.h" #include "paintball.h"
#include "decal.h" #include "decal.h"
#include "ConsoleLog.hpp" #include "consolelog.hpp"
#include "psndplat.h" #include "psndplat.h"
#include "avp_menus.h" #include "avp_menus.h"
#include "smacker.h"
#include "detaillevels.h" #include "detaillevels.h"
#include "savegame.h" #include "savegame.h"

View file

@ -31,7 +31,7 @@
#include "gadget.h" #include "gadget.h"
#include "lighting.h" #include "lighting.h"
#include "d3d_hud.h" #include "d3d_hud.h"
#include "frustrum.h" #include "frustum.h"
#include "pldghost.h" #include "pldghost.h"
#include "d3d_render.h" #include "d3d_render.h"
@ -42,7 +42,7 @@
#include "ourasert.h" #include "ourasert.h"
#include "vision.h" #include "vision.h"
#include "BonusAbilities.h" #include "bonusabilities.h"
#include "avp_menus.h" #include "avp_menus.h"
#include "showcmds.h" #include "showcmds.h"
#include "game_statistics.h" #include "game_statistics.h"

View file

@ -25,7 +25,7 @@ rounds fired etc etc etc*/
#include "pldghost.h" #include "pldghost.h"
#endif #endif
#include "AvP_UserProfile.h" #include "avp_userprofile.h"
#define UseLocalAssert Yes #define UseLocalAssert Yes
#include "ourasert.h" #include "ourasert.h"

View file

@ -25,10 +25,10 @@
#include "psnd.h" #include "psnd.h"
#include "equipmnt.h" #include "equipmnt.h"
#include "los.h" #include "los.h"
#include "AI_Sight.h" #include "ai_sight.h"
#include "targeting.h" #include "targeting.h"
#include "dxlog.h" #include "dxlog.h"
#include "ShowCmds.h" #include "showcmds.h"
#define UseLocalAssert Yes #define UseLocalAssert Yes
#include "ourasert.h" #include "ourasert.h"

View file

@ -2,7 +2,7 @@
#ifndef _included_paintball_h_ /* Is this your first time? */ #ifndef _included_paintball_h_ /* Is this your first time? */
#define _included_paintball_h_ 1 #define _included_paintball_h_ 1
#include "Decal.h" #include "decal.h"
typedef struct typedef struct
{ {

View file

@ -5164,7 +5164,7 @@ void HandlePheromoneTrails(void)
} }
} }
#include "frustrum.h" #include "frustum.h"
void RenderTrailSegment(PHEROMONE_TRAIL *trailPtr) void RenderTrailSegment(PHEROMONE_TRAIL *trailPtr)
{ {
POLYHEADER fakeHeader; POLYHEADER fakeHeader;

View file

@ -35,8 +35,8 @@ so player.c is looking a bit bare at the moment. */
#include "pldghost.h" #include "pldghost.h"
#include "dp_func.h" #include "dp_func.h"
#endif #endif
#include "ShowCmds.h" #include "showcmds.h"
#include "BonusAbilities.h" #include "bonusabilities.h"
#define PLAYER_HMODEL 0 #define PLAYER_HMODEL 0

View file

@ -34,7 +34,7 @@
#include "los.h" #include "los.h"
#include "krender.h" #include "krender.h"
#include "pldnet.h" #include "pldnet.h"
#include "BonusAbilities.h" #include "bonusabilities.h"
#include "avp_menus.h" #include "avp_menus.h"
#include "lighting.h" #include "lighting.h"
#include "scream.h" #include "scream.h"

View file

@ -30,6 +30,7 @@
/* Macros ***************************************************************/ /* Macros ***************************************************************/
/* Type definitions *****************************************************/ /* Type definitions *****************************************************/
class ConsoleSymbol class ConsoleSymbol
{ {
friend class TextInputState; friend class TextInputState;
@ -63,7 +64,8 @@
private: private:
static List <ConsoleSymbol*> List_pConsoleSym;
static List <ConsoleSymbol *> List_pConsoleSym;
}; // suggested naming: "ConsoleSym" }; // suggested naming: "ConsoleSym"
/* Exported globals *****************************************************/ /* Exported globals *****************************************************/

View file

@ -26,7 +26,8 @@ typedef struct soundsampledata
int activeInstances; int activeInstances;
int volume; int volume;
int pitch; int pitch;
LPDIRECTSOUNDBUFFER dsBufferP; // LPDIRECTSOUNDBUFFER dsBufferP;
unsigned int flags; unsigned int flags;
int dsFrequency; int dsFrequency;
char * wavName; char * wavName;
@ -57,9 +58,9 @@ typedef struct activesoundsample
unsigned int reverb_off :1; unsigned int reverb_off :1;
SOUND3DDATA threedeedata; SOUND3DDATA threedeedata;
LPDIRECTSOUNDBUFFER dsBufferP; // LPDIRECTSOUNDBUFFER dsBufferP;
LPDIRECTSOUND3DBUFFER ds3DBufferP; // LPDIRECTSOUND3DBUFFER ds3DBufferP;
LPKSPROPERTYSET PropSetP; // LPKSPROPERTYSET PropSetP;
}ACTIVESOUNDSAMPLE; }ACTIVESOUNDSAMPLE;

View file

@ -68,11 +68,7 @@
#define DB_H_INCLUDED #define DB_H_INCLUDED
/* I N C L U D E D S ************************************************** */ /* I N C L U D E D S ************************************************** */
#include "advwin32.h" //#include "advwin32.h"
#ifndef DB_NOWINDOWS
// #include <windows.h>
#include "advwin32.h"
#endif
/* Permit use in a C++ source file. */ /* Permit use in a C++ source file. */
#ifdef __cplusplus #ifdef __cplusplus

View file

@ -2,9 +2,6 @@
#define _included_dxlog_h_ #define _included_dxlog_h_
#include "system.h" #include "system.h"
#include "ddraw.h"
#include "d3d.h"
#include "d3drm.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -12,7 +9,7 @@ extern "C" {
#if debug #if debug
void dx_err_log(HRESULT error, int line, char const * file); void dx_err_log(int error, int line, char const * file);
void dx_str_log(char const * str, int line, char const * file); void dx_str_log(char const * str, int line, char const * file);
void dx_line_log(int line, char const * file); void dx_line_log(int line, char const * file);
void dx_strf_log(char const * fmt, ...); void dx_strf_log(char const * fmt, ...);
@ -23,10 +20,21 @@ void dx_strf_log(char const * fmt, ...);
#else #else
/* TODO: make these static inline to hush the compiler */
void dx_err_log(int error, int line, char const * file);
void dx_str_log(char const * str, int line, char const * file);
void dx_line_log(int line, char const * file);
void dx_strf_log(char const * fmt, ...);
#define LOGDXERR(error) dx_err_log(error,__LINE__,__FILE__)
#define LOGDXSTR(str) dx_str_log(str,__LINE__,__FILE__)
#define LOGDXFMT(args) (dx_line_log(__LINE__,__FILE__),dx_strf_log args)
/*
#define LOGDXERR(error) (void)0 #define LOGDXERR(error) (void)0
#define LOGDXSTR(str) (void)0 #define LOGDXSTR(str) (void)0
#define LOGDXFMT(args) (void)0 #define LOGDXFMT(args) (void)0
*/
#endif #endif

View file

@ -18,7 +18,7 @@
#ifndef list_template_hpp #ifndef list_template_hpp
#define list_template_hpp #define list_template_hpp
#pragma once //#pragma once
#include <stdio.h> #include <stdio.h>

View file

@ -1,6 +1,9 @@
#ifndef PLATFORM_INCLUDED #ifndef PLATFORM_INCLUDED
#define PLATFORM_INCLUDED #define PLATFORM_INCLUDED
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdint.h> // int64_t #include <stdint.h> // int64_t
#include "shape.h" // struct imageheader #include "shape.h" // struct imageheader
@ -33,12 +36,20 @@ extern "C" {
#define max(a, b) (((a) > (b)) ? (a) : (b)) #define max(a, b) (((a) > (b)) ? (a) : (b))
#endif #endif
#define stricmp strcasecmp #define TRUE 1
#define FALSE 0
#define stricmp strcasecmp
#define _stricmp strcasecmp
/* Types */ /* Types */
/* windows junk */
typedef int GUID; typedef int GUID;
typedef int DPID; typedef int DPID;
typedef int HINSTANCE;
typedef int WPARAM;
typedef int LPARAM;
typedef int BOOL; typedef int BOOL;

View file

@ -30,6 +30,7 @@ extern struct DEBUGGINGTEXTOPTIONS ShowDebuggingText;
#define DEBUGGING_TEXT_ON 0 #define DEBUGGING_TEXT_ON 0
#endif #endif
#if 0 /* stupid defines */
#if DEBUGGING_TEXT_ON #if DEBUGGING_TEXT_ON
extern int PrintDebuggingText(const char* t, ...); extern int PrintDebuggingText(const char* t, ...);
#else #else
@ -41,3 +42,7 @@ extern int ReleasePrintDebuggingText(const char* t, ...);
#else #else
#define PrintDebuggingText(ignore) #define PrintDebuggingText(ignore)
#endif #endif
#endif /* ... */
extern int PrintDebuggingText(const char* t, ...);
extern int ReleasePrintDebuggingText(const char* t, ...);