Sync tools to 45592

[reactos.git] / reactos / tools / rbuild / module.cpp

diff --git a/reactos/tools/rbuild/module.cpp b/reactos/tools/rbuild/module.cpp
index 1fdc5d6..9d3d335 100644 (file)
--- a/reactos/tools/rbuild/module.cpp
+++ b/reactos/tools/rbuild/module.cpp
@@ -396,6 +396,12 @@ Module::Module ( const Project& project,
        if ( att != NULL )
        {
                const XMLAttribute* installbase = moduleNode.GetAttribute ( "installbase", false );
+
+        if(installbase)
+            this->installbase = installbase->value;
+        else
+            this->installbase = "";
+
                install = new FileLocation ( InstallDirectory,
                                             installbase ? installbase->value : "",
                                             att->value,
@@ -1358,7 +1364,7 @@ Module::GetEntryPoint() const
        if (entrypoint == "0" || entrypoint == "0x0")
                return "0";
        
-       if (Environment::GetArch() != "arm")
+       if (Environment::GetArch() != "arm" && Environment::GetArch() != "amd64")
                result = "_";
 
        result += entrypoint;