ubergames/lilium-voyager
0
0
Fork 0
mirror of https://github.com/UberGames/lilium-voyager.git synced 2024-12-13 13:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix mingw64 installer

Browse source
This commit is contained in:
Ludwig Nussel 2012-02-07 09:29:13 +00:00
parent 7d8b751afd
commit 6c8a9af300
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -561,16 +561,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
@ -2493,6 +2496,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) \

7
misc/nsis/Makefile
View file

@ -29,12 +29,7 @@ ifndef USE_INTERNAL_JPEG
USE_INTERNAL_JPEG=1 USE_INTERNAL_JPEG=1
endif endif
SDLDLL=SDL.dll
ifeq ($(ARCH),x64)
SDLDLL=SDL64.dll
else
SDLDLL=SDL.dll
endif
DEFINES= DEFINES=
ifeq ($(USE_RENDERER_DLOPEN),1) ifeq ($(USE_RENDERER_DLOPEN),1)