Changeset 10026 for ps

Timestamp:

08/17/11 18:17:22 (13 years ago)

Author:

philip

Message:

AoEO BAR compatibility in AoE3Ed

Location:

ps/trunk

Files:

• build/premake/extern_libs4.lua (modified) (1 diff)
• build/premake/premake4.lua (modified) (3 diffs)
• source/tools/atlas/DatafileIO/BAR/BAR.cpp (modified) (3 diffs)

ps/trunk/build/premake/extern_libs4.lua

@@ -254 +254 @@
         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()

ps/trunk/build/premake/premake4.lua

@@ -808 +808 @@
     end
 
-    setup_atlas_project("AtlasUI", "SharedLib", atlas_src,
-    {   -- include
-        "..",
-        "CustomControls",
-        "Misc"
-    },{ -- extern_libs
+    atlas_extern_libs = {
         "boost",
         "comsuppw",
@@ -823 +818 @@
         "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),
@@ -841 +848 @@
         },{ -- include
         },{ -- extern_libs
+            "devil",
             "xerces",
             "zlib"

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

@@ -1 @@
-/* Copyright (C) 2009 Wildfire Games.
+/* Copyright (C) 2011 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -23 +23 @@
 #include "Stream/Memory.h"
 
-//for :25 strncmp and :81 memset
-#include <string.h>
-
 #include <cassert>
+#include <cstdio>
+#include <cstring>
 
 using namespace DatafileIO;
@@ -65 +64 @@
 
     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);