Commit 3a74285312a150af172a825b789449258d4b9b7d

Authored by DarkGod
2 parents 32e1b23c defe3dcc

plop

Merge branch 'master' into gamepad_dev

Conflicts:
	src/core_lua.c
Showing 100 changed files with 2 additions and 2 deletions

Too many changes to show.

To preserve performance only 100 of 100+ files are displayed.

... ... @@ -109,7 +109,7 @@ project "TEngine"
109 109 links { "mingw32", "SDL2main", "SDL2", "SDL2_ttf", "SDL2_image", "OpenAL32", "vorbisfile", "opengl32", "glu32", "wsock32", "png" }
110 110 defines { [[TENGINE_HOME_PATH='"T-Engine"']], 'SELFEXE_WINDOWS' }
111 111 if _OPTIONS.wincross then
112   - prebuildcommands { "/usr/bin/i686-pc-mingw32-windres ../src/windows/icon.rc -O coff -o ../src/windows/icon.res" }
  112 + prebuildcommands { "i686-pc-mingw32-windres ../src/windows/icon.rc -O coff -o ../src/windows/icon.res" }
113 113 else
114 114 prebuildcommands { "windres ../src/windows/icon.rc -O coff -o ../src/windows/icon.res" }
115 115 end
... ...
1 1 -- ToME - Tales of Maj'Eyal
2   --- Copyright (C) 2009 - 2015 Nicolas Casalini
  2 +-- Copyright (C) 2009 - 2016 Nicolas Casalini
3 3 --
4 4 -- This program is free software: you can redistribute it and/or modify
5 5 -- it under the terms of the GNU General Public License as published by
... ...