aboutsummaryrefslogtreecommitdiffstats
path: root/src/native
diff options
context:
space:
mode:
authorDamian Minkov <damencho@jitsi.org>2014-04-04 15:16:03 +0300
committerDamian Minkov <damencho@jitsi.org>2014-04-04 15:16:03 +0300
commit0c339e0c270d750596dde25a356b1a06d8a29ef2 (patch)
treef11c5ac055da2490b49c07de5379334b849a43b0 /src/native
parentb5c4487c0de1a9b74690f4afb03d564c813c89d9 (diff)
downloadjitsi-0c339e0c270d750596dde25a356b1a06d8a29ef2.zip
jitsi-0c339e0c270d750596dde25a356b1a06d8a29ef2.tar.gz
jitsi-0c339e0c270d750596dde25a356b1a06d8a29ef2.tar.bz2
Adds space for default im application checkbox in installer. Adds one more parametrised string to the executable.
Diffstat (limited to 'src/native')
-rw-r--r--src/native/windows/run/Makefile3
-rw-r--r--src/native/windows/run/run.rc2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/native/windows/run/Makefile b/src/native/windows/run/Makefile
index 3cd4591..aa31f5f 100644
--- a/src/native/windows/run/Makefile
+++ b/src/native/windows/run/Makefile
@@ -7,6 +7,7 @@
MINGW_HOME ?= C:/mingw
PRODUCTNAME ?= Jitsi
+COMPANYNAME ?= jitsi.org
PRODUCTBUILDVERSION ?= 1.0.0.0
TARGET_BASENAME ?= run
TARGET_DIR ?= ../../../../release/windows/tmp
@@ -46,7 +47,7 @@ $(cygwin.target.dir)/$(TARGET_BASENAME).exe: $(cygwin.target.dir)/config.h regis
$(cygwin.target.dir)/config.h:
-rm.exe -f ../../../../resources/install/windows/config.h
- echo.exe -e '#define PRODUCTNAME "$(PRODUCTNAME)"\n#define PRODUCTBUILDVERSION "$(PRODUCTBUILDVERSION)"\n#define TARGET_BASENAME "$(TARGET_BASENAME)"\n#define TARGET_BASENAME_EXE "$(TARGET_BASENAME).exe"' > $(cygwin.target.dir)/config.h
+ echo.exe -e '#define PRODUCTNAME "$(PRODUCTNAME)"\n#define COMPANYNAME "$(COMPANYNAME)"\n#define PRODUCTBUILDVERSION "$(PRODUCTBUILDVERSION)"\n#define TARGET_BASENAME "$(TARGET_BASENAME)"\n#define TARGET_BASENAME_EXE "$(TARGET_BASENAME).exe"' > $(cygwin.target.dir)/config.h
$(cygwin.target.dir)/run.res: $(cygwin.target.dir)/config.h run.rc
$(WINDRES) -I../../../../resources/install/windows -I$(target.dir) run.rc -O coff -o $(target.dir)/run.res
diff --git a/src/native/windows/run/run.rc b/src/native/windows/run/run.rc
index 0020b72..724c651 100644
--- a/src/native/windows/run/run.rc
+++ b/src/native/windows/run/run.rc
@@ -30,7 +30,7 @@ BEGIN
BLOCK "040904E4"
BEGIN
VALUE "Comments", ""
- VALUE "CompanyName", "jitsi.org"
+ VALUE "CompanyName", COMPANYNAME
VALUE "FileDescription", PRODUCTNAME
VALUE "FileVersion", PRODUCTBUILDVERSION
VALUE "InternalName", TARGET_BASENAME