AoEO BAR compatibility in AoE3Ed

This was SVN commit r10026.

build/premake/extern_libs4.lua

@@ -253,6 +253,23 @@ extern_lib_defs = {
 			})
 		end,
 	},
+	devil = {
+		compile_settings = function()
+			if os.is("windows") then
+				add_default_include_paths("devil")
+			end
+		end,
+		link_settings = function()
+			-- On Windows, it uses #pragma comment(lib ...) to link the library,
+			-- so we only need to include the library-search-path
+			if os.is("windows") then
+				add_default_lib_paths("devil")
+			end
+			add_default_links({
+				unix_names = { "IL", "ILU" },
+			})
+		end,
+	},
 	enet = {
 		compile_settings = function()
 			if not _OPTIONS["with-system-enet"] then

build/premake/premake4.lua

@@ -807,12 +807,7 @@ function setup_atlas_projects()
 		table.insert(atlas_extra_links, "xerces-c")
 	end
 
-	setup_atlas_project("AtlasUI", "SharedLib", atlas_src,
-	{	-- include
-		"..",
-		"CustomControls",
-		"Misc"
-	},{	-- extern_libs
+	atlas_extern_libs = {
 		"boost",
 		"comsuppw",
 		--"ffmpeg", -- disabled for now because it causes too many build difficulties
@@ -822,7 +817,19 @@ function setup_atlas_projects()
 		"wxwidgets",
 		"x11",
 		"zlib",
-	},{	-- extra_params
+	}
+	if _OPTIONS["aoe3ed"] then
+		table.insert(atlas_extern_libs, "devil")
+	end
+
+	setup_atlas_project("AtlasUI", "SharedLib", atlas_src,
+	{	-- include
+		"..",
+		"CustomControls",
+		"Misc"
+	},
+	atlas_extern_libs,
+	{	-- extra_params
 		pch_dir = rootdir.."/source/tools/atlas/AtlasUI/Misc/",
 		no_pch = (has_broken_pch),
 		extra_links = atlas_extra_links,
@@ -840,6 +847,7 @@ function setup_atlas_projects()
 			"XMB"
 		},{	-- include
 		},{	-- extern_libs
+			"devil",
 			"xerces",
 			"zlib"
 		},{	-- extra_params

source/tools/atlas/DatafileIO/BAR/BAR.cpp

@@ -1,4 +1,4 @@
-/* Copyright (C) 2009 Wildfire Games.
+/* Copyright (C) 2011 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -22,10 +22,9 @@
 #include "Stream/Stream.h"
 #include "Stream/Memory.h"
 
-//for :25 strncmp and :81 memset
-#include <string.h>
-
 #include <cassert>
+#include <cstdio>
+#include <cstring>
 
 using namespace DatafileIO;
 
@@ -64,7 +63,8 @@ bool BARReader::Initialise()
 	m_Stream.Read(&filetableOffset, 4);
 
 	m_Stream.Read(&unknown, 4);
-	CHECK(unknown == 0);
+	// 0 in AoE3
+	// Non-zero (e.g. 466a800a, 8df1e438) in AoEO; purpose unknown
 
 	m_Stream.Seek(filetableOffset, Stream::FROM_START);