Löse das Verzeichnis client/console auf

This commit is contained in:
Yamagi Burmeister 2010-11-25 15:32:39 +00:00
parent b859cec1e2
commit ff360644fc
4 changed files with 10 additions and 12 deletions

View file

@ -115,8 +115,6 @@ all: client dedicated_server ref_gl baseq2 ctf
client:
@-mkdir -p build \
build/client \
build/client/console \
build/client/input \
build/client/menu \
build/client/sound \
build/common \
@ -178,6 +176,7 @@ clean:
# Client object
CLIENT_OBJS = \
build/client/cl_cin.o \
build/client/cl_console.o \
build/client/cl_download.o \
build/client/cl_effects.o \
build/client/cl_entities.o \
@ -193,7 +192,6 @@ CLIENT_OBJS = \
build/client/cl_tempentities.o \
build/client/cl_screen.o \
build/client/cl_view.o \
build/client/console/console.o \
build/client/menu/menu.o \
build/client/menu/qmenu.o \
build/client/menu/videomenu.o \
@ -448,6 +446,9 @@ CTF_OBJS = \
build/client/cl_cin.o : src/client/cl_cin.c
$(CC) $(CFLAGS_CLIENT) -o $@ -c $<
build/client/cl_console.o : src/client/cl_console.c
$(CC) $(CFLAGS_CLIENT) -o $@ -c $<
build/client/cl_download.o : src/client/cl_download.c
$(CC) $(CFLAGS_CLIENT) -o $@ -c $<
@ -493,9 +494,6 @@ build/client/cl_screen.o : src/client/cl_screen.c
build/client/cl_view.o : src/client/cl_view.c
$(CC) $(CFLAGS_CLIENT) -o $@ -c $<
build/client/console/console.o : src/client/console/console.c
$(CC) $(CFLAGS_CLIENT) -o $@ -c $<
build/client/menu/menu.o : src/client/menu/menu.c
$(CC) $(CFLAGS_CLIENT) -o $@ -c $<

View file

@ -24,7 +24,7 @@
* =======================================================================
*/
#include "../header/client.h"
#include "header/client.h"
#include <time.h>
console_t con;

View file

@ -58,8 +58,8 @@
#include "screen.h"
#include "input.h"
#include "keyboard.h"
#include "console.h"
#include "../console/header/console.h"
#include "../sound/header/cdaudio.h"
#include "../sound/header/sound.h"
#include "../sound/header/vorbis.h"

View file

@ -24,11 +24,11 @@
* =======================================================================
*/
#ifndef CL_CONSOLE_CONSOLE_H
#define CL_CONSOLE_CONSOLE_H
#ifndef CL_HEADER_CONSOLE_H
#define CL_HEADER_CONSOLE_H
#define NUM_CON_TIMES 4
#define CON_TEXTSIZE 32768
#define NUM_CON_TIMES 4
#define CON_TEXTSIZE 32768
typedef struct {
qboolean initialized;