diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-11-19 10:44:13 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-11-19 10:44:13 -0300 |
| commit | fd5ee87c24ed34baad0b541b1e100c6bf067fb92 (patch) | |
| tree | 54a9e3ff765a721c360cdb65a767f15b75931029 /tools/pe_bliss | |
| parent | d3eb9e8c54d4a93b2bed90a5988f9814377d409f (diff) | |
| parent | 83316bcc9ce6a07d11cc85cfe86bb7221c9a5d90 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
platform/windows/export/export.h
Diffstat (limited to 'tools/pe_bliss')
| -rw-r--r-- | tools/pe_bliss/SCsub | 1 | ||||
| -rw-r--r-- | tools/pe_bliss/pe_section.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tools/pe_bliss/SCsub b/tools/pe_bliss/SCsub index 34524f10ef..8173769c39 100644 --- a/tools/pe_bliss/SCsub +++ b/tools/pe_bliss/SCsub @@ -1,5 +1,6 @@ Import('env') env.add_source_files(env.tool_sources,"*.cpp") +env.Append(LIBS=["iconv"]) Export('env') diff --git a/tools/pe_bliss/pe_section.cpp b/tools/pe_bliss/pe_section.cpp index 7aed5e2c26..72127e22e2 100644 --- a/tools/pe_bliss/pe_section.cpp +++ b/tools/pe_bliss/pe_section.cpp @@ -19,6 +19,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#include <algorithm> #include <string.h> #include "utils.h" #include "pe_section.h" |