comparison libpurple/win32/global.mak @ 32740:200a6032d8ec

makensis on Windows now accepts - or / as an argument prefix (since 2.25). This means that we can just use - directly and not make it configurable. This will alleviate issues for people using the MSYS shell. Thanks to renatosilva for this. Fixes #14960
author Daniel Atallah <daniel.atallah@gmail.com>
date Tue, 28 Feb 2012 22:41:57 +0000
parents 80affba7ea0d
children 2908b16efa07
comparison
equal deleted inserted replaced
32739:bba25395d28e 32740:200a6032d8ec
100 ifeq "$(origin CC)" "default" 100 ifeq "$(origin CC)" "default"
101 CC := gcc.exe 101 CC := gcc.exe
102 endif 102 endif
103 GMSGFMT ?= $(WIN32_DEV_TOP)/gettext-0.17/bin/msgfmt 103 GMSGFMT ?= $(WIN32_DEV_TOP)/gettext-0.17/bin/msgfmt
104 MAKENSIS ?= makensis.exe 104 MAKENSIS ?= makensis.exe
105 MAKENSISOPT ?= /
106 PERL ?= perl 105 PERL ?= perl
107 WINDRES ?= windres 106 WINDRES ?= windres
108 STRIP ?= strip 107 STRIP ?= strip
109 INTLTOOL_MERGE ?= $(WIN32_DEV_TOP)/intltool_0.40.4-1_win32/bin/intltool-merge 108 INTLTOOL_MERGE ?= $(WIN32_DEV_TOP)/intltool_0.40.4-1_win32/bin/intltool-merge
110 109