[quake3-commits] r2220 - in trunk: . misc/nsis

[DONOTREPLY at icculus.org]

Author: ludwig
Date: 2012-02-07 04:29:13 -0500 (Tue, 07 Feb 2012)
New Revision: 2220

Modified:
   trunk/Makefile
   trunk/misc/nsis/Makefile
Log:
fix mingw64 installer

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2012-02-06 21:28:40 UTC (rev 2219)
+++ trunk/Makefile	2012-02-07 09:29:13 UTC (rev 2220)
@@ -561,16 +561,19 @@
                       $(LIBSDIR)/win32/libSDL.dll.a
     RENDERER_LIBS += $(LIBSDIR)/win32/libSDLmain.a \
                       $(LIBSDIR)/win32/libSDL.dll.a
+    SDLDLL=SDL.dll
     else
     CLIENT_LIBS += $(LIBSDIR)/win64/libSDLmain.a \
                       $(LIBSDIR)/win64/libSDL64.dll.a
     RENDERER_LIBS += $(LIBSDIR)/win64/libSDLmain.a \
                       $(LIBSDIR)/win64/libSDL64.dll.a
+    SDLDLL=SDL64.dll
     endif
   else
     CLIENT_CFLAGS += $(SDL_CFLAGS)
     CLIENT_LIBS += $(SDL_LIBS)
     RENDERER_LIBS += $(SDL_LIBS)
+    SDLDLL=SDL.dll
   endif
 
   BUILD_CLIENT_SMP = 0
@@ -2493,6 +2496,7 @@
 installer: release
 ifeq ($(PLATFORM),mingw32)
 	@$(MAKE) VERSION=$(VERSION) -C $(NSISDIR) V=$(V) \
+		SDLDLL=$(SDLDLL) \
 		USE_RENDERER_DLOPEN=$(USE_RENDERER_DLOPEN) \
 		USE_OPENAL_DLOPEN=$(USE_OPENAL_DLOPEN) \
 		USE_CURL_DLOPEN=$(USE_CURL_DLOPEN) \

Modified: trunk/misc/nsis/Makefile
===================================================================
--- trunk/misc/nsis/Makefile	2012-02-06 21:28:40 UTC (rev 2219)
+++ trunk/misc/nsis/Makefile	2012-02-07 09:29:13 UTC (rev 2220)
@@ -29,13 +29,8 @@
 USE_INTERNAL_JPEG=1
 endif
 
+SDLDLL=SDL.dll
 
-ifeq ($(ARCH),x64)
-  SDLDLL=SDL64.dll
-else
-  SDLDLL=SDL.dll
-endif
-
 DEFINES=
 ifeq ($(USE_RENDERER_DLOPEN),1)
 	DEFINES+= -DUSE_RENDERER_DLOPEN