mirror of
https://git.code.sf.net/p/quake/quakeforge-old
synced 2025-02-21 11:01:12 +00:00
Makefile.in - Explicitly list patterns instead of using echo, conditionally
run ranlib d_part.c, snd_sun.c, vid_sunx.c - missing includes
This commit is contained in:
parent
3357d40344
commit
3c8f2939af
4 changed files with 10 additions and 4 deletions
|
@ -19,7 +19,7 @@ mandir := @mandir@
|
||||||
|
|
||||||
TARGET_DIR := $(PROJECT_ODIR)/targets
|
TARGET_DIR := $(PROJECT_ODIR)/targets
|
||||||
BUILD_DIR := $(TARGET_DIR)/common
|
BUILD_DIR := $(TARGET_DIR)/common
|
||||||
OBJ_PATTERN := $(shell echo $(BUILD_DIR)/{sound,common}_lib/%.o)
|
OBJ_PATTERN := $(BUILD_DIR)/sound_lib/%.o $(BUILD_DIR)/common_lib/%.o
|
||||||
|
|
||||||
SOUND_LIB := sound_lib.a
|
SOUND_LIB := sound_lib.a
|
||||||
|
|
||||||
|
@ -155,7 +155,7 @@ $(SOUND_LIB): sound_lib_DIR $(TARGET_DIR)/sound_lib.a
|
||||||
$(TARGET_DIR)/sound_lib.a: $(SOUND_LIB_OBJS)
|
$(TARGET_DIR)/sound_lib.a: $(SOUND_LIB_OBJS)
|
||||||
#gcc -Wall -shared -o $@ $(SOUND_LIB_OBJS)
|
#gcc -Wall -shared -o $@ $(SOUND_LIB_OBJS)
|
||||||
ar cru $@ $(SOUND_LIB_OBJS)
|
ar cru $@ $(SOUND_LIB_OBJS)
|
||||||
ranlib $@
|
@RANLIB@ $@
|
||||||
|
|
||||||
|
|
||||||
###########################################################################
|
###########################################################################
|
||||||
|
|
|
@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
#include "quakedef.h"
|
#include "quakedef.h"
|
||||||
#include "d_local.h"
|
#include "d_local.h"
|
||||||
|
#include "mathlib.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
==============
|
==============
|
||||||
|
|
|
@ -19,6 +19,12 @@ along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
#include "config.h"
|
||||||
|
#include "qtypes.h"
|
||||||
|
#include "sound.h"
|
||||||
|
#include "qargs.h"
|
||||||
|
#include "console.h"
|
||||||
|
|
||||||
#ifdef HAVE_UNISTD_H
|
#ifdef HAVE_UNISTD_H
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#endif
|
#endif
|
||||||
|
@ -32,7 +38,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <sys/audioio.h>
|
#include <sys/audioio.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include "quakedef.h"
|
|
||||||
|
|
||||||
int audio_fd;
|
int audio_fd;
|
||||||
int snd_inited;
|
int snd_inited;
|
||||||
|
|
|
@ -45,6 +45,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
#include "quakedef.h"
|
#include "quakedef.h"
|
||||||
#include "d_local.h"
|
#include "d_local.h"
|
||||||
|
#include "keys.h"
|
||||||
|
|
||||||
cvar_t _windowed_mouse = {"_windowed_mouse","0", true};
|
cvar_t _windowed_mouse = {"_windowed_mouse","0", true};
|
||||||
cvar_t m_filter = {"m_filter","0", true};
|
cvar_t m_filter = {"m_filter","0", true};
|
||||||
|
|
Loading…
Reference in a new issue