summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAriel Manzur <ariel@okamstudio.com>2015-12-20 11:50:16 -0300
committerAriel Manzur <ariel@okamstudio.com>2015-12-20 11:50:16 -0300
commitbec1e003e794c44a8f9fc060502efdec44241f25 (patch)
tree1025afe81ac7a74a6c344633abac11bf02aca485
parenta5fe71a0e9a8714ae8f23f306b4d8b747d11382d (diff)
this failed on mingw on linux (but not on msvc) with 2 problems:
1) it didn't print the error to the console, only this: build_res_file(["platform/windows/godot_res.windows.tools.32.o"], ["platform/windows/godot_res.rc"]) scons: *** [platform/windows/godot_res.windows.tools.32.o] Error 1 I had to print the actual command and run it on a console to see the error. The builder should be able to print the command it's running and the error, like it does with compiler invocations, etc. 2) The actual error was a syntax error on line 11 of godot_res.rc. I looked up "FILEVERSION" and "PRODUCTVERSION" (here https://msdn.microsoft.com/en-us/library/windows/desktop/aa381058(v=vs.85).aspx), it says they take 4 numbers as parameters, so I added those 0s, but I'm not sure if they're in the right order. @masoudbh3 can you check it out? thanks It builds on msvc just fine with (and without) these changes.
-rw-r--r--platform/windows/godot_res.rc6
1 files changed, 3 insertions, 3 deletions
diff --git a/platform/windows/godot_res.rc b/platform/windows/godot_res.rc
index f77182f909..1a38bb4708 100644
--- a/platform/windows/godot_res.rc
+++ b/platform/windows/godot_res.rc
@@ -7,8 +7,8 @@
GODOT_ICON ICON platform/windows/godot.ico
1 VERSIONINFO
-FILEVERSION VERSION_MAJOR,VERSION_MINOR,0
-PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,0
+FILEVERSION VERSION_MAJOR,0,VERSION_MINOR,0
+PRODUCTVERSION VERSION_MAJOR,0,VERSION_MINOR,0
FILEOS 4
FILETYPE 1
BEGIN
@@ -30,4 +30,4 @@ BEGIN
BEGIN
VALUE "Translation", 0x409, 1200
END
-END \ No newline at end of file
+END