mirror of
https://github.com/yquake2/yquake2remaster.git
synced 2024-11-26 14:30:48 +00:00
Move glob.c and glob.h to common
We need glob_match() for Windows
This commit is contained in:
parent
9618483d48
commit
1a3b54b27e
5 changed files with 5 additions and 5 deletions
6
Makefile
6
Makefile
|
@ -403,6 +403,7 @@ CLIENT_OBJS_ := \
|
||||||
src/common/crc.o \
|
src/common/crc.o \
|
||||||
src/common/cvar.o \
|
src/common/cvar.o \
|
||||||
src/common/filesystem.o \
|
src/common/filesystem.o \
|
||||||
|
src/common/glob.o \
|
||||||
src/common/md4.o \
|
src/common/md4.o \
|
||||||
src/common/misc.o \
|
src/common/misc.o \
|
||||||
src/common/netchan.o \
|
src/common/netchan.o \
|
||||||
|
@ -438,7 +439,6 @@ CLIENT_OBJS_ := \
|
||||||
src/server/sv_send.o \
|
src/server/sv_send.o \
|
||||||
src/server/sv_user.o \
|
src/server/sv_user.o \
|
||||||
src/server/sv_world.o \
|
src/server/sv_world.o \
|
||||||
src/unix/glob.o \
|
|
||||||
src/unix/hunk.o \
|
src/unix/hunk.o \
|
||||||
src/unix/main.o \
|
src/unix/main.o \
|
||||||
src/unix/network.o \
|
src/unix/network.o \
|
||||||
|
@ -454,6 +454,7 @@ SERVER_OBJS_ := \
|
||||||
src/common/crc.o \
|
src/common/crc.o \
|
||||||
src/common/cvar.o \
|
src/common/cvar.o \
|
||||||
src/common/filesystem.o \
|
src/common/filesystem.o \
|
||||||
|
src/common/glob.o \
|
||||||
src/common/md4.o \
|
src/common/md4.o \
|
||||||
src/common/misc.o \
|
src/common/misc.o \
|
||||||
src/common/netchan.o \
|
src/common/netchan.o \
|
||||||
|
@ -495,7 +496,6 @@ SERVER_OBJS_ += \
|
||||||
src/windows/system.o
|
src/windows/system.o
|
||||||
else
|
else
|
||||||
SERVER_OBJS_ += \
|
SERVER_OBJS_ += \
|
||||||
src/unix/glob.o \
|
|
||||||
src/unix/hunk.o \
|
src/unix/hunk.o \
|
||||||
src/unix/main.o \
|
src/unix/main.o \
|
||||||
src/unix/network.o \
|
src/unix/network.o \
|
||||||
|
@ -526,8 +526,8 @@ OPENGL_OBJS_ = \
|
||||||
src/refresh/files/wal.o \
|
src/refresh/files/wal.o \
|
||||||
src/sdl/input.o \
|
src/sdl/input.o \
|
||||||
src/sdl/refresh.o \
|
src/sdl/refresh.o \
|
||||||
|
src/common/glob.o \
|
||||||
src/common/shared/shared.o \
|
src/common/shared/shared.o \
|
||||||
src/unix/glob.o \
|
|
||||||
src/unix/hunk.o \
|
src/unix/hunk.o \
|
||||||
src/unix/qgl.o
|
src/unix/qgl.o
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "header/common.h"
|
#include "header/common.h"
|
||||||
#include "../unix/header/glob.h"
|
#include "../common/header/glob.h"
|
||||||
|
|
||||||
#ifdef ZIP
|
#ifdef ZIP
|
||||||
#include "unzip/unzip.h"
|
#include "unzip/unzip.h"
|
||||||
|
|
|
@ -45,8 +45,8 @@
|
||||||
#include <dlfcn.h>
|
#include <dlfcn.h>
|
||||||
#include <dirent.h>
|
#include <dirent.h>
|
||||||
|
|
||||||
#include "header/glob.h"
|
|
||||||
#include "../common/header/common.h"
|
#include "../common/header/common.h"
|
||||||
|
#include "../common/header/glob.h"
|
||||||
#include "header/unix.h"
|
#include "header/unix.h"
|
||||||
|
|
||||||
unsigned sys_frame_time;
|
unsigned sys_frame_time;
|
||||||
|
|
Loading…
Reference in a new issue