msvc compatibility
This commit is contained in:
parent
a40c818e54
commit
facdb59c66
|
@ -13,6 +13,8 @@ isEmpty(APP_VERSION) {
|
||||||
APP_VERSION=1.0.2
|
APP_VERSION=1.0.2
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
win32: VERSION = $${APP_VERSION}.0
|
win32: VERSION = $${APP_VERSION}.0
|
||||||
else: VERSION = $${APP_VERSION}
|
else: VERSION = $${APP_VERSION}
|
||||||
|
|
||||||
|
@ -29,6 +31,10 @@ gcc {
|
||||||
QMAKE_CXXFLAGS_DEBUG += -Werror=return-type
|
QMAKE_CXXFLAGS_DEBUG += -Werror=return-type
|
||||||
}
|
}
|
||||||
|
|
||||||
|
msvc {
|
||||||
|
DEFINES += NOMINMAX
|
||||||
|
}
|
||||||
|
|
||||||
# You can make your code fail to compile if it uses deprecated APIs.
|
# You can make your code fail to compile if it uses deprecated APIs.
|
||||||
# In order to do so, uncomment the following line.
|
# In order to do so, uncomment the following line.
|
||||||
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
|
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
class Runner;
|
class Runner;
|
||||||
class Compiler;
|
class Compiler;
|
||||||
class Project;
|
class Project;
|
||||||
class OJProblemCase;
|
struct OJProblemCase;
|
||||||
using POJProblemCase = std::shared_ptr<OJProblemCase>;
|
using POJProblemCase = std::shared_ptr<OJProblemCase>;
|
||||||
class CompilerManager : public QObject
|
class CompilerManager : public QObject
|
||||||
{
|
{
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
#include "parser/cppparser.h"
|
#include "parser/cppparser.h"
|
||||||
|
|
||||||
class Editor;
|
class Editor;
|
||||||
class BufferCoord;
|
struct BufferCoord;
|
||||||
class Project;
|
class Project;
|
||||||
class CppRefacter : public QObject
|
class CppRefacter : public QObject
|
||||||
{
|
{
|
||||||
|
|
|
@ -149,8 +149,10 @@ MainWindow::MainWindow(QWidget *parent)
|
||||||
ui->tblStackTrace->setModel(mDebugger->backtraceModel());
|
ui->tblStackTrace->setModel(mDebugger->backtraceModel());
|
||||||
ui->watchView->setModel(mDebugger->watchModel());
|
ui->watchView->setModel(mDebugger->watchModel());
|
||||||
ui->tblMemoryView->setModel(mDebugger->memoryModel());
|
ui->tblMemoryView->setModel(mDebugger->memoryModel());
|
||||||
|
|
||||||
ui->tblMemoryView->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
|
ui->tblMemoryView->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
|
||||||
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
mDebugger->breakpointModel()->load(includeTrailingPathDelimiter(pSettings->dirs().config())
|
mDebugger->breakpointModel()->load(includeTrailingPathDelimiter(pSettings->dirs().config())
|
||||||
+DEV_BREAKPOINTS_FILE);
|
+DEV_BREAKPOINTS_FILE);
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
*/
|
*/
|
||||||
#include "projectversioninfowidget.h"
|
#include "projectversioninfowidget.h"
|
||||||
#include "ui_projectversioninfowidget.h"
|
#include "ui_projectversioninfowidget.h"
|
||||||
#include <winnls.h>
|
#include <windows.h>
|
||||||
#include "../mainwindow.h"
|
#include "../mainwindow.h"
|
||||||
#include "../project.h"
|
#include "../project.h"
|
||||||
|
|
||||||
|
|
|
@ -38,7 +38,7 @@ AboutDialog::AboutDialog(QWidget *parent) :
|
||||||
#else
|
#else
|
||||||
ui->lblQt->setText(ui->lblQt->text()
|
ui->lblQt->setText(ui->lblQt->text()
|
||||||
.arg(qVersion())
|
.arg(qVersion())
|
||||||
.arg(tr("Non-GCC Compiler"));
|
.arg(tr("Non-GCC Compiler")));
|
||||||
#endif
|
#endif
|
||||||
ui->lblCompileTime->setText(ui->lblCompileTime->text()
|
ui->lblCompileTime->setText(ui->lblCompileTime->text()
|
||||||
.arg(__DATE__, __TIME__));
|
.arg(__DATE__, __TIME__));
|
||||||
|
|
|
@ -460,7 +460,7 @@ ChineseSimplified::ChineseSimplified() // 中文(简体)
|
||||||
addPair("Invalid default options:", L"默认选项无效:");
|
addPair("Invalid default options:", L"默认选项无效:");
|
||||||
addPair("Invalid project options:", L"项目选项无效:");
|
addPair("Invalid project options:", L"项目选项无效:");
|
||||||
addPair("Invalid command line options:", L"无效的命令行选项:");
|
addPair("Invalid command line options:", L"无效的命令行选项:");
|
||||||
addPair("For help on options type 'astyle -h'", L"输入 'astyle -h' 以获得有关命令行的帮助");
|
addPair("For help on options type 'astyle -h'", L"输入 'astyle -h' 以获得有关命令行的帮助" );
|
||||||
addPair("Cannot open default option file", L"无法打开默认选项文件");
|
addPair("Cannot open default option file", L"无法打开默认选项文件");
|
||||||
addPair("Cannot open project option file", L"无法打开项目选项文件");
|
addPair("Cannot open project option file", L"无法打开项目选项文件");
|
||||||
addPair("Cannot open directory", L"无法打开目录");
|
addPair("Cannot open directory", L"无法打开目录");
|
||||||
|
|
|
@ -29,6 +29,11 @@ win32: {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
win32-msvc {
|
||||||
|
QMAKE_CFLAGS += /source-charset:utf-8
|
||||||
|
QMAKE_CXXFLAGS += /source-charset:utf-8
|
||||||
|
}
|
||||||
|
|
||||||
# Default rules for deployment.
|
# Default rules for deployment.
|
||||||
qnx: target.path = $${PREFIX}/libexec/$${APP_NAME}
|
qnx: target.path = $${PREFIX}/libexec/$${APP_NAME}
|
||||||
else: unix:!android: target.path = $${PREFIX}/libexec/$${APP_NAME}
|
else: unix:!android: target.path = $${PREFIX}/libexec/$${APP_NAME}
|
||||||
|
|
|
@ -22,6 +22,9 @@ using std::string;
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#include <conio.h>
|
#include <conio.h>
|
||||||
|
|
||||||
|
#ifndef WINBOOL
|
||||||
|
#define WINBOOL BOOL
|
||||||
|
#endif
|
||||||
#define MAX_COMMAND_LENGTH 32768
|
#define MAX_COMMAND_LENGTH 32768
|
||||||
#define MAX_ERROR_LENGTH 2048
|
#define MAX_ERROR_LENGTH 2048
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,14 @@
|
||||||
TEMPLATE = app
|
win32-msvc{
|
||||||
CONFIG += windows
|
CONFIG += c++11
|
||||||
CONFIG -= app_bundle
|
CONFIG -= app_bundle
|
||||||
CONFIG -= qt
|
DEFINES -= UNICODE
|
||||||
DEFINES -= UNICODE
|
} else {
|
||||||
|
TEMPLATE = app
|
||||||
|
|
||||||
|
CONFIG += windows
|
||||||
|
CONFIG -= app_bundle
|
||||||
|
CONFIG -= qt
|
||||||
|
}
|
||||||
isEmpty(APP_NAME) {
|
isEmpty(APP_NAME) {
|
||||||
APP_NAME = RedPandaCPP
|
APP_NAME = RedPandaCPP
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue