[General][Build][Qt] Build even using LLVM CLANG. I tested on clang/clang++-3.5 .

diff --git a/source/src/config.cpp b/source/src/config.cpp
index 111f16f..e54105a 100644 (file)
--- a/source/src/config.cpp
+++ b/source/src/config.cpp
@@ -51,7 +51,7 @@ bool WritePrivateProfileString(char *lpAppName, char *lpKeyName, char *Value, FI
    s = s + lpKeyName + "=";
    s = s + Value + "\n";
    
-   lpFileName->Fwrite(s.c_str(), s.length(), 1);
+   lpFileName->Fwrite((void *)s.c_str(), s.length(), 1);
    return true;
 }
 
@@ -68,7 +68,7 @@ bool WritePrivateProfileInt(char *lpAppName, char *lpKeyName, int Value, FILEIO
    s = s + ".";
    s = s + lpKeyName + "=";
    s = s + valuebuf + "\n";
-   lpFileName->Fwrite(s.c_str(), s.length(), 1);
+   lpFileName->Fwrite((void *)s.c_str(), s.length(), 1);
 
    return true;
 }

diff --git a/source/src/qt/common/emu_input.cpp b/source/src/qt/common/emu_input.cpp
index 7462da8..102b057 100644 (file)
--- a/source/src/qt/common/emu_input.cpp
+++ b/source/src/qt/common/emu_input.cpp
@@ -890,7 +890,7 @@ bool  JoyThreadClass::EventSDL(SDL_Event *eventQueue)
    int vk;
    uint32_t sym;
    int i;
-   if(eventQueue == NULL) return;
+   if(eventQueue == NULL) return false;
        /*
         * JoyStickなどはSDLが管理する
         */
@@ -921,7 +921,7 @@ bool  JoyThreadClass::EventSDL(SDL_Event *eventQueue)
     default:
       break;
    }
-   return TRUE;
+   return true;
 }
 
 

diff --git a/source/src/qt/common/emuevents_control.cpp b/source/src/qt/common/emuevents_control.cpp
index 2957ffc..0172c47 100644 (file)
--- a/source/src/qt/common/emuevents_control.cpp
+++ b/source/src/qt/common/emuevents_control.cpp
@@ -135,7 +135,7 @@ void OnRecentQD(int drive, int menunum)
   }
   strcpy(config.recent_quickdisk_path[drive][0], path.c_str());
   if(emu) {
-    emu->open_quickdisk(drive, path.c_str());
+    emu->open_quickdisk(drive, (_TCHAR *)(path.c_str()));
   }
 }
 #endif

diff --git a/source/src/qt/common/qt_main.cpp b/source/src/qt/common/qt_main.cpp
index e6f1788..76a4024 100644 (file)
--- a/source/src/qt/common/qt_main.cpp
+++ b/source/src/qt/common/qt_main.cpp
@@ -470,6 +470,7 @@ bool InitInstance(int argc, char *argv[])
 {
   rMainWindow = new META_MainWindow();
   rMainWindow->connect(rMainWindow, SIGNAL(sig_quit_all(void)), rMainWindow, SLOT(deleteLater(void)));
+  return true;
 }  
 
 

diff --git a/source/src/qt/common/sdl_cpuid.c b/source/src/qt/common/sdl_cpuid.c
index d8c06a9..b40d3df 100644 (file)
--- a/source/src/qt/common/sdl_cpuid.c
+++ b/source/src/qt/common/sdl_cpuid.c
@@ -16,6 +16,8 @@ void getCpuID(struct AGAR_CPUID *p)
    Uint32 a,b,c,d;
    a = b = c = d = 0;
    if(__get_cpuid(0x80000001 , &a, &b, &c, &d) == 0) return; // Get Features
+#ifdef __llvm__
+#elif defined(__GNUC__)
    p->use_mmx = ((d & bit_MMX) != 0)?-1:0;
    p->use_sse = ((d & bit_SSE) != 0)?-1:0;
    p->use_sse2 = ((d & bit_SSE2) != 0)?-1:0;
@@ -30,6 +32,7 @@ void getCpuID(struct AGAR_CPUID *p)
    p->use_mmxext = ((d & bit_MMXEXT) != 0)?-1:0;
    p->use_3dnow = ((d & bit_3DNOW) != 0)?-1:0;
    p->use_3dnowp = ((d & bit_3DNOWP) != 0)?-1:0;
+#endif
 }
 
 struct AGAR_CPUID *initCpuID(void)

diff --git a/source/src/qt/gui/qt_input.cpp b/source/src/qt/gui/qt_input.cpp
index 47d1823..d8cd516 100644 (file)
--- a/source/src/qt/gui/qt_input.cpp
+++ b/source/src/qt/gui/qt_input.cpp
@@ -187,8 +187,7 @@ const struct QtKeyTable  QtKeyMappings[] = {
        { 0xF3,                 Qt::Key_Zenkaku },
        { 0xF4,                 Qt::Key_Hankaku },
        { 0xF3,                 Qt::Key_Zenkaku_Hankaku },
-   
-        { 0xffff, 0xffff},
+       { 0xffff, Qt::Key_unknown},
 };
 
 

diff --git a/source/src/qt/gui/util_cart.cpp b/source/src/qt/gui/util_cart.cpp
index bf6f475..72b765b 100644 (file)
--- a/source/src/qt/gui/util_cart.cpp
+++ b/source/src/qt/gui/util_cart.cpp
@@ -66,7 +66,7 @@ void Ui_MainWindow::set_recent_cart(int drv, int num)
    
    if(emu) {
       eject_cart(drv);
-      emu->LockVM();
+//      emu->LockVM();
       emu->open_cart(drv, path_shadow);
       for(i = 0; i < MAX_HISTORY; i++) {
         if(action_Recent_List_CART[drv][i] != NULL) { 
@@ -74,7 +74,7 @@ void Ui_MainWindow::set_recent_cart(int drv, int num)
            //actiont_Recent_List_FD[drv][i]->changed();
         }
       }
-      emu->UnlockVM();
+//      emu->UnlockVM();
    }
 }
 #endif

diff --git a/source/src/qt/gui/util_cmt.cpp b/source/src/qt/gui/util_cmt.cpp
index 7811e95..50da623 100644 (file)
--- a/source/src/qt/gui/util_cmt.cpp
+++ b/source/src/qt/gui/util_cmt.cpp
@@ -21,7 +21,7 @@ int Ui_MainWindow::set_recent_cmt(int num)
     QString s_path;
     char path_shadow[PATH_MAX];
     int i;
-    if((num < 0) || (num >= MAX_HISTORY)) return;
+    if((num < 0) || (num >= MAX_HISTORY)) return -1;
     
     s_path = QString::fromUtf8(config.recent_tape_path[num]);
     strncpy(path_shadow, s_path.toUtf8().constData(), PATH_MAX);
@@ -47,6 +47,7 @@ int Ui_MainWindow::set_recent_cmt(int num)
          //emit action_Recent_List_FD[drive][i]->changed();
        }
     }
+   return 0;
 }
 
 void Ui_MainWindow::do_write_protect_cmt(bool flag)

diff --git a/source/src/qt/gui/util_fd.cpp b/source/src/qt/gui/util_fd.cpp
index 9c6a6cd..5b8baf0 100644 (file)
--- a/source/src/qt/gui/util_fd.cpp
+++ b/source/src/qt/gui/util_fd.cpp
@@ -19,17 +19,18 @@ QT_BEGIN_NAMESPACE
 int Ui_MainWindow::write_protect_fd(int drv, bool flag)
 {
 #ifdef USE_FD1
-  if((drv < 0) || (drv >= MAX_FD)) return;
+  if((drv < 0) || (drv >= MAX_FD)) return -1;
   if(emu) {
     emu->write_protect_fd(drv, flag);
   }
 #endif
+  return 0;
 }
   
 #ifdef USE_FD1
 int Ui_MainWindow::set_d88_slot(int drive, int num)
 {
-  if((num < 0) || (num >= MAX_D88_BANKS)) return;
+  if((num < 0) || (num >= MAX_D88_BANKS)) return -1;
   if(emu && emu->d88_file[drive].cur_bank != num) {
 //    emu->open_disk(drive, emu->d88_file[drive].path, emu->d88_file[drive].bank[num].offset);
     emu->open_disk(drive, emu->d88_file[drive].path, num);
@@ -41,6 +42,7 @@ int Ui_MainWindow::set_d88_slot(int drive, int num)
     action_D88_ListImage_FD[drive][num]->setChecked(true);
     emu->d88_file[drive].cur_bank = num;
   }
+  return 0;
 }
 int Ui_MainWindow::set_recent_disk(int drv, int num) 
 {
@@ -48,7 +50,7 @@ int Ui_MainWindow::set_recent_disk(int drv, int num)
     char path_shadow[PATH_MAX];
     int i;
     
-    if((num < 0) || (num >= MAX_HISTORY)) return;
+    if((num < 0) || (num >= MAX_HISTORY)) return -1;
     
    s_path = QString::fromUtf8(config.recent_disk_path[drv][num]);
    strncpy(path_shadow, s_path.toUtf8().constData(), PATH_MAX);
@@ -126,6 +128,7 @@ int Ui_MainWindow::set_recent_disk(int drv, int num)
    }
 # endif
    }
+   return 0;
 }
 
 #endif

diff --git a/source/src/qt/gui/util_qd.cpp b/source/src/qt/gui/util_qd.cpp
index a58fc76..3c80325 100644 (file)
--- a/source/src/qt/gui/util_qd.cpp
+++ b/source/src/qt/gui/util_qd.cpp
@@ -19,11 +19,12 @@ QT_BEGIN_NAMESPACE
 int Ui_MainWindow::write_protect_Qd(int drv, bool flag)
 {
 #ifdef USE_QD1
-  if((drv < 0) || (drv >= MAX_QD)) return;
+  if((drv < 0) || (drv >= MAX_QD)) return -1;
   if(emu) {
 //    emu->write_protect_Qd(drv, flag);
   }
 #endif
+  return 0;
 }
   
 int Ui_MainWindow::set_recent_quick_disk(int drv, int num) 
@@ -32,7 +33,7 @@ int Ui_MainWindow::set_recent_quick_disk(int drv, int num)
     QString s_path;
     char path_shadow[_MAX_PATH];
     int i;
-    if((num < 0) || (num >= MAX_HISTORY)) return;
+    if((num < 0) || (num >= MAX_HISTORY)) return -1;
     s_path = QString::fromUtf8(config.recent_quickdisk_path[drv][num]);
     strncpy(path_shadow, s_path.toUtf8().constData(), _MAX_PATH);
     UPDATE_HISTORY(path_shadow, config.recent_quickdisk_path[drv]);
@@ -59,6 +60,7 @@ int Ui_MainWindow::set_recent_quick_disk(int drv, int num)
        }
     }
 #endif
+    return 0;
 }
 
 void Ui_MainWindow::_open_quick_disk(int drv, const QString fname)

diff --git a/source/src/qt/pc6001/MainWindow.cpp b/source/src/qt/pc6001/MainWindow.cpp
index 7e6bcf0..e4e38c3 100644 (file)
--- a/source/src/qt/pc6001/MainWindow.cpp
+++ b/source/src/qt/pc6001/MainWindow.cpp
@@ -57,7 +57,7 @@ void META_MainWindow::do_set_sound_device(int num)
 
 void META_MainWindow::retranslateUi(void)
 {
-  const char title="";
+  const char *title="";
   retranslateControlMenu(title, false);
   retranslateFloppyMenu(0, 1);
   retranslateFloppyMenu(1, 2);

diff --git a/source/src/qt/pc8801ma/MainWindow.cpp b/source/src/qt/pc8801ma/MainWindow.cpp
index 8715f56..463b63e 100644 (file)
--- a/source/src/qt/pc8801ma/MainWindow.cpp
+++ b/source/src/qt/pc8801ma/MainWindow.cpp
@@ -57,7 +57,7 @@ void META_MainWindow::do_set_sound_device(int num)
 
 void META_MainWindow::retranslateUi(void)
 {
-  const char title="";
+  const char *title="";
   retranslateControlMenu(title, false);
   retranslateFloppyMenu(0, 1);
   retranslateFloppyMenu(1, 2);

diff --git a/source/src/qt/pc9801/MainWindow.cpp b/source/src/qt/pc9801/MainWindow.cpp
index 0deaa60..95cc4e2 100644 (file)
--- a/source/src/qt/pc9801/MainWindow.cpp
+++ b/source/src/qt/pc9801/MainWindow.cpp
@@ -31,7 +31,7 @@ void META_MainWindow::do_set_sound_device(int num)
 
 void META_MainWindow::retranslateUi(void)
 {
-  const char title="";
+  const char *title="";
   retranslateControlMenu(title, false);
 #if defined(USE_FD1)
   retranslateFloppyMenu(0, 1);

diff --git a/source/src/qt/pc98ha/MainWindow.cpp b/source/src/qt/pc98ha/MainWindow.cpp
index 3a4c6a4..6e788a8 100644 (file)
--- a/source/src/qt/pc98ha/MainWindow.cpp
+++ b/source/src/qt/pc98ha/MainWindow.cpp
@@ -22,7 +22,7 @@ void META_MainWindow::do_set_sound_device(int num)
 
 void META_MainWindow::retranslateUi(void)
 {
-  const char title="";
+  const char *title="";
   retranslateControlMenu(title, false);
 #if defined(USE_FD1)
   retranslateFloppyMenu(0, 1);

diff --git a/source/src/vm/datarec.cpp b/source/src/vm/datarec.cpp
index b8e9a94..bceb4d8 100644 (file)
--- a/source/src/vm/datarec.cpp
+++ b/source/src/vm/datarec.cpp
@@ -1378,7 +1378,7 @@ int DATAREC::load_t77_image(void)
        play_fio->Fseek(0, FILEIO_SEEK_SET);
        play_fio->Fread(tmpbuf, 16, 1);
        tmpbuf[16] = '\0';
-       if(strcmp(tmpbuf, "XM7 TAPE IMAGE 0") != 0) return 0;
+       if(strcmp((char *)tmpbuf, "XM7 TAPE IMAGE 0") != 0) return 0;
        buffer_ptr = 0;
        file_size = file_size - 16;
        // MAGIC Ok.

diff --git a/source/src/vm/upd765a.cpp b/source/src/vm/upd765a.cpp
index 455dfd2..23a2002 100644 (file)
--- a/source/src/vm/upd765a.cpp
+++ b/source/src/vm/upd765a.cpp
@@ -750,8 +750,8 @@ void UPD765A::cmd_write_data()
                if(result) {
                        shift_to_result7();
                } else {
-                       int length = 0x80 << __min(8, id[3]);
-                       if(!id[3]) {
+                       int length = 0x80 << __min(8, id[3] & 0x07);
+                       if((id[3] & 0x07) == 0) {
                                length = __min(dtl, 0x80);
                                memset(buffer + length, 0, 0x80 - length);
                        }
@@ -885,7 +885,7 @@ void UPD765A::read_data(bool deleted, bool scan)
                REGISTER_PHASE_EVENT(PHASE_TIMER, 100000);
                return;
        }
-       int length = id[3] ? (0x80 << __min(8, id[3])) : (__min(dtl, 0x80));
+       int length = ((id[3] & 0x07) != 0) ? (0x80 << __min(8, id[3] & 0x07)) : (__min(dtl, 0x80));
        if(!scan) {
                shift_to_read(length);
        } else {
@@ -930,7 +930,7 @@ void UPD765A::read_diagnostic()
        memcpy(buffer + disk[drv]->get_track_size() - disk[drv]->data_position[0], disk[drv]->track, disk[drv]->data_position[0]);
        fdc[drv].next_trans_position = disk[drv]->data_position[0];
        
-       shift_to_read(0x80 << __min(8, id[3]));
+       shift_to_read(0x80 << __min(8, id[3] & 0x07));
        return;
 }
 
@@ -1025,7 +1025,7 @@ uint32 UPD765A::write_sector(bool deleted)
                        continue;
                }
                // sector number is matched
-               int size = 0x80 << __min(8, id[3]);
+               int size = 0x80 << __min(8, id[3] & 0x07);
                memcpy(disk[drv]->sector, buffer, __min(size, disk[drv]->sector_size.sd));
                disk[drv]->set_deleted(deleted);
                return 0;
@@ -1232,7 +1232,7 @@ uint32 UPD765A::write_id()
        int drv = hdu & DRIVE_MASK;
        int trk = fdc[drv].track;
        int side = (hdu >> 2) & 1;
-       int length = 0x80 << __min(8, id[3]);
+       int length = 0x80 << __min(8, id[3] & 0x07);
        
        if((result = check_cond(true)) != 0) {
                return result;

diff --git a/source/src/vm/upd765a.h b/source/src/vm/upd765a.h
index 657eef5..8f90ec6 100644 (file)
--- a/source/src/vm/upd765a.h
+++ b/source/src/vm/upd765a.h
@@ -127,14 +127,6 @@ private:
           if(x < y) return y;
           return x;
        }
-        int __min(uint8 x, uint8 y) {
-          if(x > y) return y;
-          return x;
-       }
-        int __max(uint8 x, uint8 y) {
-          if(x < y) return y;
-          return x;
-       }
 #endif
        
 public: