Changeset 294 in dev for trunk/abdev/BasicCompiler_Common/MakeExe.cpp

Timestamp:

Aug 22, 2007, 11:23:28 PM (17 years ago)

Author:

dai_9181

Message:

 

File:

• trunk/abdev/BasicCompiler_Common/MakeExe.cpp (modified) (2 diffs)

trunk/abdev/BasicCompiler_Common/MakeExe.cpp

@@ -2 +2 @@
 
 #include <jenga/include/smoothie/Smoothie.h>
+#include <jenga/include/common/Path.h>
 
 #include <Compiler.h>
@@ -130 +131 @@
 
     StepCompileProgress();
+
+
+    /////////////////////////////////////////////////////////////////
+    // 静的リンクライブラリをロードする
+    /////////////////////////////////////////////////////////////////
+
+    if( !compiler.IsCore() )
+    {
+        // コアモジュールをロードする
+        extern BOOL bDebugCompile;
+        extern char szIncludeDir[MAX_PATH];
+
+        const char *coreFileName = "core.lib";
+        if( bDebugCompile )
+        {
+            coreFileName = "cored.lib";
+        }
+
+        char coreFilePath[MAX_PATH];
+        sprintf( coreFilePath, "..\\lib\\%s", coreFileName );
+        GetFullPath( coreFilePath, szIncludeDir );
+
+        compiler.staticLibraries.push_back( new ObjectModule() );
+        compiler.staticLibraries.back()->Read( coreFilePath );
+    }
+
+    BOOST_FOREACH( const std::string &filePath, compiler.staticLibraryFilePaths )
+    {
+        compiler.staticLibraries.push_back( new ObjectModule() );
+        compiler.staticLibraries.back()->Read( filePath );
+
+        Jenga::Common::Path path( filePath );
+        CompileMessage( ((string)"\"" + path.GetFileName() + path.GetExt() + "\" を読み込みました。").c_str() );
+    }