rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-29 23:42:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

IOQ3 commit 2220

Browse source
This commit is contained in:
Richard Allen 2012-02-26 14:54:46 +00:00
parent 60bdc1e9bb
commit de87248d9c
2 changed files with 45 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reaction/Makefile
View file

@ -536,16 +536,19 @@ ifeq ($(PLATFORM),mingw32)
$(LIBSDIR)/win32/libSDL.dll.a $(LIBSDIR)/win32/libSDL.dll.a
RENDERER_LIBS += $(LIBSDIR)/win32/libSDLmain.a \ RENDERER_LIBS += $(LIBSDIR)/win32/libSDLmain.a \
$(LIBSDIR)/win32/libSDL.dll.a $(LIBSDIR)/win32/libSDL.dll.a
SDLDLL=SDL.dll
else else
CLIENT_LIBS += $(LIBSDIR)/win64/libSDLmain.a \ CLIENT_LIBS += $(LIBSDIR)/win64/libSDLmain.a \
$(LIBSDIR)/win64/libSDL64.dll.a $(LIBSDIR)/win64/libSDL64.dll.a
RENDERER_LIBS += $(LIBSDIR)/win64/libSDLmain.a \ RENDERER_LIBS += $(LIBSDIR)/win64/libSDLmain.a \
$(LIBSDIR)/win64/libSDL64.dll.a $(LIBSDIR)/win64/libSDL64.dll.a
SDLDLL=SDL64.dll
endif endif
else else
CLIENT_CFLAGS += $(SDL_CFLAGS) CLIENT_CFLAGS += $(SDL_CFLAGS)
CLIENT_LIBS += $(SDL_LIBS) CLIENT_LIBS += $(SDL_LIBS)
RENDERER_LIBS += $(SDL_LIBS) RENDERER_LIBS += $(SDL_LIBS)
SDLDLL=SDL.dll
endif endif
BUILD_CLIENT_SMP = 0 BUILD_CLIENT_SMP = 0
@ -2500,6 +2503,7 @@ distclean: clean toolsclean
installer: release installer: release
ifeq ($(PLATFORM),mingw32) ifeq ($(PLATFORM),mingw32)
@$(MAKE) VERSION=$(VERSION) -C $(NSISDIR) V=$(V) \ @$(MAKE) VERSION=$(VERSION) -C $(NSISDIR) V=$(V) \
SDLDLL=$(SDLDLL) \
USE_RENDERER_DLOPEN=$(USE_RENDERER_DLOPEN) \ USE_RENDERER_DLOPEN=$(USE_RENDERER_DLOPEN) \
USE_OPENAL_DLOPEN=$(USE_OPENAL_DLOPEN) \ USE_OPENAL_DLOPEN=$(USE_OPENAL_DLOPEN) \
USE_CURL_DLOPEN=$(USE_CURL_DLOPEN) \ USE_CURL_DLOPEN=$(USE_CURL_DLOPEN) \

47
reaction/misc/nsis/Makefile
View file

@ -10,12 +10,47 @@ endif
ifndef INSTALLDIR ifndef INSTALLDIR
INSTALLDIR=. INSTALLDIR=.
endif endif
ifndef USE_RENDERER_DLOPEN
ifeq ($(ARCH),x64) USE_RENDERER_DLOPEN=1
SDLDLL=SDL64.dll
else
SDLDLL=SDL.dll
endif endif
ifndef USE_OPENAL_DLOPEN
USE_OPENAL_DLOPEN=1
endif
ifndef USE_CURL_DLOPEN
USE_CURL_DLOPEN=0
endif
ifndef USE_INTERNAL_SPEEX
USE_INTERNAL_SPEEX=1
endif
ifndef USE_INTERNAL_ZLIB
USE_INTERNAL_ZLIB=1
endif
ifndef USE_INTERNAL_JPEG
USE_INTERNAL_JPEG=1
endif
SDLDLL=SDL.dll
DEFINES=
ifeq ($(USE_RENDERER_DLOPEN),1)
DEFINES+= -DUSE_RENDERER_DLOPEN
endif
ifeq ($(USE_OPENAL_DLOPEN),1)
DEFINES+= -DUSE_OPENAL_DLOPEN
endif
ifeq ($(USE_CURL_DLOPEN),1)
DEFINES+= -DUSE_CURL_DLOPEN
endif
ifeq ($(USE_INTERNAL_SPEEX),1)
DEFINES+= -DUSE_INTERNAL_SPEEX
endif
ifeq ($(USE_INTERNAL_ZLIB),1)
DEFINES+= -DUSE_INTERNAL_ZLIB
endif
ifeq ($(USE_INTERNAL_JPEG),1)
DEFINES+= -DUSE_INTERNAL_JPEG
endif
all: ioquake3-$(VERSION)-$(RELEASE).$(ARCH).exe all: ioquake3-$(VERSION)-$(RELEASE).$(ARCH).exe
@ -23,7 +58,7 @@ ioquake3.$(ARCH).nsi: ioquake3.nsi.in
sed 's/XXXVERSIONXXX/$(VERSION)/;s/XXXRELEASEXXX/$(RELEASE)/;s/x86/$(ARCH)/g;s/SDL.dll/$(SDLDLL)/' < $< > $@ sed 's/XXXVERSIONXXX/$(VERSION)/;s/XXXRELEASEXXX/$(RELEASE)/;s/x86/$(ARCH)/g;s/SDL.dll/$(SDLDLL)/' < $< > $@
ioquake3-$(VERSION)-$(RELEASE).$(ARCH).exe: ioquake3.$(ARCH).nsi ioquake3-$(VERSION)-$(RELEASE).$(ARCH).exe: ioquake3.$(ARCH).nsi
makensis ioquake3.$(ARCH).nsi makensis $(DEFINES) ioquake3.$(ARCH).nsi
clean: clean:
rm -rf *.exe ioquake3.$(ARCH).nsi rm -rf *.exe ioquake3.$(ARCH).nsi