[WIN32] Merge from win32.

Merge branch 'master' of github.com:Artanejp/common_source_project-fm7

diff --git a/source/build-cmake/pyuta/CMakeLists.txt b/source/build-cmake/pyuta/CMakeLists.txt
new file mode 100644 (file)
index 0000000..5962e45
--- /dev/null
+++ b/source/build-cmake/pyuta/CMakeLists.txt
@@ -0,0 +1,70 @@
+# Build Common Sourcecode Project, Qt.
+# (C) 2014 K.Ohta <whatisthis.sowhat@gmail.com>
+# This is part of XM7/SDL, but license is apache 2.2,
+# this part was written only me.
+
+cmake_minimum_required (VERSION 2.8)
+cmake_policy(SET CMP0011 NEW)
+
+message("")
+message("** Start of configure CommonSourceProject, TOMY Pyuta, Qt **")
+message("")
+
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake")
+
+
+project (emupyuta)
+
+set(LOCAL_LIBS            vm_pyuta
+                  vm_vm
+                  common_common
+#                 vm_fmgen
+                  qt_pyuta
+                  qt_gui
+                   )
+
+set(VMFILES_BASE
+                  tms9995.cpp
+                  sn76489an.cpp
+                  tms9918a.cpp
+                  
+                  datarec.cpp
+                  
+                  event.cpp
+                  memory.cpp
+)
+
+
+set(BUILD_SHARED_LIBS OFF)
+set(USE_OPENMP ON CACHE BOOL "Build using OpenMP")
+set(USE_OPENCL ON CACHE BOOL "Build using OpenCL")
+set(USE_OPENGL ON CACHE BOOL "Build using OpenGL")
+set(XM7_VERSION 3)
+#set(WITH_DEBUGGER ON CACHE BOOL "Build with debugger.")
+
+include(detect_target_cpu)
+#include(windows-mingw-cross)
+# set entry
+set(CMAKE_SYSTEM_PROCESSOR ${ARCHITECTURE} CACHE STRING "Set processor to build.")
+
+
+set(VMFILES ${VMFILES_BASE})
+add_definitions(-D_PYUTA)
+set(EXEC_TARGET emupyuta)
+
+#include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/vm/pyuta)
+#include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/vm/fmgen)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/qt/pyuta)
+
+
+include(config_commonsource)
+
+
+
+add_subdirectory(../../src/vm/pyuta vm/pyuta)
+#add_subdirectory(../../src/vm/fmgen vm/fmgen)
+add_subdirectory(../../src/qt/pyuta qt/pyuta)
+
+     
+add_subdirectory(../../src/qt/common qt/common)

diff --git a/source/src/qt/common/agar_logger.cpp b/source/src/qt/common/agar_logger.cpp
index e9f161b..729ba00 100644 (file)
--- a/source/src/qt/common/agar_logger.cpp
+++ b/source/src/qt/common/agar_logger.cpp
@@ -81,11 +81,11 @@ void AGAR_DebugLog(int level, const char *fmt, ...)
        if(log_cons != 0) { // Print only
           timedat = localtime(&nowtime);
           strftime(strbuf2, 255, "%Y-%m-%d %H:%M:%S", timedat);
-          snprintf(strbuf3, 23, ".%06d", tv.tv_usec);
+          snprintf(strbuf3, 23, ".%06ld", tv.tv_usec);
           fprintf(stdout, "%s : %s%s %s\n", sysname, strbuf2, strbuf3, strbuf);
        } 
        if(syslog_flag != 0) { // SYSLOG
-          syslog(level_flag, "uS=%06d %s", tv.tv_usec, strbuf);
+          syslog(level_flag, "uS=%06ld %s", tv.tv_usec, strbuf);
        }
        va_end(ap);
      }

diff --git a/source/src/qt/pyuta/CMakeLists.txt b/source/src/qt/pyuta/CMakeLists.txt
new file mode 100644 (file)
index 0000000..da9ff0d
--- /dev/null
+++ b/source/src/qt/pyuta/CMakeLists.txt
@@ -0,0 +1,13 @@
+message("* qt/pyuta")
+
+set(s_qt_pyuta_headers
+         menuclasses.h
+)
+QT4_WRAP_CPP(s_qt_pyuta_headers_MOC ${s_qt_pyuta_headers})
+
+add_library(qt_pyuta
+         MainWindow.cpp
+         ${s_qt_pyuta_headers_MOC}
+)
+
+

diff --git a/source/src/qt/pyuta/MainWindow.cpp b/source/src/qt/pyuta/MainWindow.cpp
new file mode 100644 (file)
index 0000000..f5fa234
--- /dev/null
+++ b/source/src/qt/pyuta/MainWindow.cpp
@@ -0,0 +1,60 @@
+/*
+ * Common Source code Project:
+ * Ui->Qt->MainWindow for PC Engine .
+ * (C) 2015 K.Ohta <whatisthis.sowhat _at_ gmail.com>
+ *   License : GPLv2
+ *   History :
+ * Jan 14, 2015 : Initial, many of constructors were moved to qt/gui/menu_main.cpp.
+ */
+
+#include <QtCore/QVariant>
+#include <QtGui>
+#include "menuclasses.h"
+#include "emu.h"
+#include "qt_main.h"
+
+//QT_BEGIN_NAMESPACE
+       
+
+void META_MainWindow::setupUI_Emu(void)
+{
+   int i;
+}
+
+void META_MainWindow::retranslateUi(void)
+{
+  retranslateControlMenu("",  false);
+  retranslateCartMenu(0, 1);
+  retranslateCMTMenu();
+  retranslateSoundMenu();
+  retranslateScreenMenu();
+   
+  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0, QApplication::UnicodeUTF8));
+  
+  
+  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0, QApplication::UnicodeUTF8));
+  
+
+  menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0, QApplication::UnicodeUTF8));
+  menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0, QApplication::UnicodeUTF8));
+  
+  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0, QApplication::UnicodeUTF8));
+} // retranslateUi
+
+
+
+META_MainWindow::META_MainWindow(QWidget *parent) : Ui_MainWindow(parent)
+{
+   setupUI_Emu();
+   retranslateUi();
+}
+
+
+META_MainWindow::~META_MainWindow()
+{
+}
+
+//QT_END_NAMESPACE
+
+
+

diff --git a/source/src/qt/pyuta/menuclasses.h b/source/src/qt/pyuta/menuclasses.h
new file mode 100644 (file)
index 0000000..e9751d1
--- /dev/null
+++ b/source/src/qt/pyuta/menuclasses.h
@@ -0,0 +1,27 @@
+
+#ifndef _CSP_QT_MENUCLASSES_H
+#define _CSP_QT_MENUCLASSES_H
+
+#include "mainwidget.h"
+// This extends class CSP_MainWindow as Ui_MainWindow.
+// You may use this as 
+QT_BEGIN_NAMESPACE
+
+
+class Ui_MainWindow;
+//  wrote of X1 Specific menu.
+class META_MainWindow : public Ui_MainWindow {
+  Q_OBJECT
+ protected:
+  void setupUI_Emu(void);
+  void retranslateUi(void);
+ public:
+  META_MainWindow(QWidget *parent = 0);
+  ~META_MainWindow();
+public slots:
+
+};
+
+QT_END_NAMESPACE
+
+#endif // END

diff --git a/source/src/vm/pyuta/CMakeLists.txt b/source/src/vm/pyuta/CMakeLists.txt
new file mode 100644 (file)
index 0000000..0b125fd
--- /dev/null
+++ b/source/src/vm/pyuta/CMakeLists.txt
@@ -0,0 +1,8 @@
+cmake_minimum_required (VERSION 2.6)
+
+message("* vm/pyuta")
+
+  add_library(vm_pyuta
+       memory.cpp
+       pyuta.cpp
+  )