mirror of
https://github.com/yquake2/yquake2remaster.git
synced 2024-11-25 22:10:59 +00:00
Makefile refactoring
WITH_RETEXTURING for OSX and Win32 (should work)
This commit is contained in:
parent
a7f02a5b0e
commit
99dffc3efe
1 changed files with 25 additions and 51 deletions
76
Makefile
76
Makefile
|
@ -229,13 +229,26 @@ endif
|
|||
# ----------
|
||||
|
||||
# Phony targets
|
||||
.PHONY : all client game icon refresher server
|
||||
#.PHONY : all client game icon refresher server
|
||||
.PHONY : all client game icon server
|
||||
|
||||
# ----------
|
||||
|
||||
# Builds everything
|
||||
#all: client server refresher game
|
||||
all: client server game
|
||||
all: config client server game
|
||||
|
||||
# Print config values
|
||||
config:
|
||||
@echo "Build configuration"
|
||||
@echo "============================"
|
||||
@echo "WITH_CDA = $(WITH_CDA)"
|
||||
@echo "WITH_OPENAL = $(WITH_OPENAL)"
|
||||
@echo "WITH_RETEXTURING = $(WITH_RETEXTURING)"
|
||||
@echo "WITH_X11GAMMA = $(WITH_X11GAMMA)"
|
||||
@echo "WITH_ZIP = $(WITH_ZIP)"
|
||||
@echo "WITH_SYSTEMWIDE = $(WITH_SYSTEMWIDE)"
|
||||
@echo "WITH_SYSTEMDIR = $(WITH_SYSTEMDIR)"
|
||||
@echo "============================"
|
||||
|
||||
# ----------
|
||||
|
||||
|
@ -392,46 +405,31 @@ endif
|
|||
|
||||
# The refresher
|
||||
ifeq ($(OSTYPE), Windows)
|
||||
refresher:
|
||||
@echo "===> Building ref_gl.dll"
|
||||
${Q}stuff/misc/mkdir.exe -p release
|
||||
$(MAKE) release/ref_gl.dll
|
||||
|
||||
build/refresher/%.o: %.c
|
||||
@echo "===> CC $<"
|
||||
${Q}stuff/misc/mkdir.exe -p $(@D)
|
||||
${Q}$(CC) -c $(CFLAGS) $(SDLCFLAGS) $(X11CFLAGS) $(INCLUDE) -o $@ $<
|
||||
|
||||
release/ref_gl.dll : LDFLAGS += -shared
|
||||
|
||||
ifeq ($(WITH_RETEXTURING),yes)
|
||||
release/ref_gl.dll : CFLAGS += -DRETEXTURE
|
||||
release/ref_gl.dll : LDFLAGS += -ljpeg
|
||||
release/quake2.exe : CFLAGS += -DRETEXTURE
|
||||
release/quake2.exe : LDFLAGS += -ljpeg
|
||||
endif
|
||||
else
|
||||
refresher:
|
||||
@echo "===> Building ref_gl.so"
|
||||
${Q}mkdir -p release
|
||||
$(MAKE) release/ref_gl.so
|
||||
|
||||
build/refresher/%.o: %.c
|
||||
@echo "===> CC $<"
|
||||
${Q}mkdir -p $(@D)
|
||||
${Q}$(CC) -c $(CFLAGS) $(SDLCFLAGS) $(X11CFLAGS) $(INCLUDE) -o $@ $<
|
||||
|
||||
release/ref_gl.so : CFLAGS += -fPIC
|
||||
release/ref_gl.so : LDFLAGS += -shared
|
||||
|
||||
ifeq ($(WITH_X11GAMMA),yes)
|
||||
release/ref_gl.so : CFLAGS += -DX11GAMMA
|
||||
release/quake2 : CFLAGS += -DX11GAMMA
|
||||
endif
|
||||
|
||||
ifeq ($(WITH_RETEXTURING),yes)
|
||||
release/ref_gl.so : CFLAGS += -DRETEXTURE
|
||||
release/quake2 : CFLAGS += -DRETEXTURE
|
||||
ifeq ($(OSTYPE), Darwin)
|
||||
release/ref_gl.so : LDFLAGS += -framework libjpeg
|
||||
release/quake2 : LDFLAGS += -framework libjpeg
|
||||
else
|
||||
release/ref_gl.so : LDFLAGS += -ljpeg
|
||||
release/quake2 : LDFLAGS += -ljpeg
|
||||
endif
|
||||
endif
|
||||
|
||||
|
@ -672,16 +670,7 @@ OPENGL_OBJS_ = \
|
|||
src/refresh/files/sp2.o \
|
||||
src/refresh/files/tga.o \
|
||||
src/refresh/files/jpeg.o \
|
||||
src/refresh/files/wal.o# \
|
||||
src/common/shared/shared.o
|
||||
|
||||
ifeq ($(OSTYPE), Windows)
|
||||
OPENGL_OBJS_ += \
|
||||
src/backends/windows/shared/mem.o
|
||||
#else
|
||||
#OPENGL_OBJS_ += \
|
||||
src/backends/unix/shared/hunk.o
|
||||
endif
|
||||
src/refresh/files/wal.o
|
||||
|
||||
# ----------
|
||||
|
||||
|
@ -711,13 +700,13 @@ GAME_DEPS= $(GAME_OBJS:.o=.d)
|
|||
|
||||
# release/quake2
|
||||
ifeq ($(OSTYPE), Windows)
|
||||
release/quake2.exe : $(CLIENT_OBJS) icon
|
||||
release/quake2.exe : $(CLIENT_OBJS) $(OPENGL_OBJS) icon
|
||||
@echo "===> LD $@"
|
||||
${Q}$(CC) build/icon/icon.res $(CLIENT_OBJS) $(LDFLAGS) $(SDLLDFLAGS) -o $@
|
||||
else
|
||||
release/quake2 : $(CLIENT_OBJS) $(OPENGL_OBJS)
|
||||
@echo "===> LD $@"
|
||||
${Q}$(CC) $(CLIENT_OBJS) $(OPENGL_OBJS) $(LDFLAGS) $(SDLLDFLAGS) -o $@
|
||||
${Q}$(CC) $(CLIENT_OBJS) $(OPENGL_OBJS) $(LDFLAGS) $(SDLLDFLAGS) $(X11LDFLAGS) -o $@
|
||||
endif
|
||||
|
||||
# release/q2ded
|
||||
|
@ -731,21 +720,6 @@ release/q2ded : $(SERVER_OBJS)
|
|||
${Q}$(CC) $(SERVER_OBJS) $(LDFLAGS) -o $@
|
||||
endif
|
||||
|
||||
# release/ref_gl.so
|
||||
#ifeq ($(OSTYPE), Windows)
|
||||
#release/ref_gl.dll : $(OPENGL_OBJS)
|
||||
# @echo "===> LD $@"
|
||||
# ${Q}$(CC) $(OPENGL_OBJS) $(LDFLAGS) $(SDLLDFLAGS) -o $@
|
||||
#else ifeq ($(OSTYPE), Darwin)
|
||||
#release/ref_gl.so : $(OPENGL_OBJS)
|
||||
# @echo "===> LD $@"
|
||||
# ${Q}$(CC) $(OPENGL_OBJS) $(LDFLAGS) $(SDLLDFLAGS) -o $@
|
||||
#else
|
||||
#release/ref_gl.so : $(OPENGL_OBJS)
|
||||
# @echo "===> LD $@"
|
||||
# ${Q}$(CC) $(OPENGL_OBJS) $(LDFLAGS) $(X11LDFLAGS) -o $@
|
||||
#endif
|
||||
|
||||
# release/baseq2/game.so
|
||||
ifeq ($(OSTYPE), Windows)
|
||||
release/baseq2/game.dll : $(GAME_OBJS)
|
||||
|
|
Loading…
Reference in a new issue