mirror of
https://github.com/yquake2/yquake2remaster.git
synced 2024-11-30 00:10:53 +00:00
Merge branch 'windows' of github.com:yquake2/yquake2 into windows
Conflicts: Makefile TODO src/windows/header/winquake.h src/windows/system.c
This commit is contained in:
commit
7c41b66821
1 changed files with 1 additions and 0 deletions
1
Makefile
1
Makefile
|
@ -619,6 +619,7 @@ OPENGL_OBJS_ += \
|
||||||
src/windows/qgl.o
|
src/windows/qgl.o
|
||||||
else
|
else
|
||||||
OPENGL_OBJS_ += \
|
OPENGL_OBJS_ += \
|
||||||
|
src/common/shared/shared.o \
|
||||||
src/unix/hunk.o \
|
src/unix/hunk.o \
|
||||||
src/unix/qgl.o
|
src/unix/qgl.o
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in a new issue