Changeset 733 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/MakeExe.cpp

Timestamp:

Aug 24, 2008, 6:07:40 PM (16 years ago)

Author:

イグトランス (egtra)

Message:

Unicodeライブラリに対応

File:

• trunk/ab5.0/abdev/BasicCompiler_Common/MakeExe.cpp (modified) (9 diffs)

trunk/ab5.0/abdev/BasicCompiler_Common/MakeExe.cpp

@@ -27 +27 @@
 
 void AddSourceCode(const char *buffer){
-    char *temp;
-    temp=(char *)HeapAlloc(hHeap,0,lstrlen(buffer)+8192);
+    char *temp=(char *)HeapAlloc(hHeap,0,lstrlen(buffer)+8192);
     lstrcpy(temp,buffer);
 
@@ -37 +36 @@
 
     HeapDefaultFree(temp);
+}
+
+namespace{
+    const char *GetCoreLibName()
+    {
+        if( compiler.IsDebug() ){
+            if( compiler.IsUnicode() ){
+                return "coreud.lib";
+            }
+            else{
+                return "cored.lib";
+            }
+        }
+        else{
+            if( compiler.IsUnicode() ){
+                return "coreu.lib";
+            }
+            else{
+                return "core.lib";
+            }
+        }
+    }
 }
 
@@ -51 +72 @@
 
     //プログレスバーの設定
-    PostMessage(GetDlgItem(hMainDlg,IDC_PROGRESS),PBM_SETRANGE,0,MAKELPARAM(0,6));
-    PostMessage(GetDlgItem(hMainDlg,IDC_PROGRESS),PBM_SETSTEP,1,0);
+    HWND hwndProgress=GetDlgItem(hMainDlg,IDC_PROGRESS);
+    PostMessage(hwndProgress,PBM_SETRANGE,0,MAKELPARAM(0,6));
+    PostMessage(hwndProgress,PBM_SETSTEP,1,0);
 
     //"中断"
@@ -167 +189 @@
             extern BOOL bDebugCompile;
 
-            const char *coreFileName = "core.lib";
-            if( compiler.IsDebug() )
-            {
-                coreFileName = "cored.lib";
-            }
+            const char *coreFileName = GetCoreLibName();
 
             char coreFilePath[MAX_PATH];
-#ifdef _AMD64_
+#if defined _AMD64_
             sprintf( coreFilePath, "..\\lib\\x64\\%s", coreFileName );
 #else
@@ -187 +205 @@
                 if( compiler.staticLibraries.back()->Read( coreFilePath ) )
                 {
-                    compiler.messenger.Output( ((std::string)"\"" + path.GetFullPath() + "\" を読み込みました。").c_str() );
+                    compiler.messenger.Output( ('\"' + path.GetFullPath() + "\" を読み込みました。").c_str() );
                 }
                 else
@@ -212 +230 @@
                 if( compiler.staticLibraries.back()->Read( filePath ) )
                 {
-                    compiler.messenger.Output( ((std::string)"\"" + path.GetFullPath() + "\" を読み込みました。").c_str() );
+                    compiler.messenger.Output( ('\"' + path.GetFullPath() + "\" を読み込みました。").c_str() );
                 }
                 else
@@ -250 +268 @@
 EndCompile:
     if(bStopCompile){
-        PostMessage(GetDlgItem(hMainDlg,IDC_PROGRESS),PBM_SETPOS,0,0);
+        PostMessage(hwndProgress,PBM_SETPOS,0,0);
 
         //"コンパイルはユーザーにより中断されました。"
@@ -295 +313 @@
 #endif
 }
-void MainThread(void *)
+unsigned __stdcall MainThread(void *)
 {
     if( program.IsDebugRun() )
@@ -315 +333 @@
         Build();
     }
-}
+    return 0;
+}