mirror of
https://github.com/rizinorg/cutter.git
synced 2024-12-18 19:06:10 +00:00
Added appveyor build (#29)
This commit is contained in:
parent
d764dd9cf5
commit
4e9d0d0dc1
42
.appveyor.yml
Normal file
42
.appveyor.yml
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
version: '1.0-git-{build}'
|
||||||
|
skip_tags: true
|
||||||
|
image: 'Visual Studio 2015'
|
||||||
|
clone_depth: 1
|
||||||
|
|
||||||
|
# Build configuration
|
||||||
|
configuration:
|
||||||
|
- Release
|
||||||
|
|
||||||
|
# Branches to build
|
||||||
|
branches:
|
||||||
|
only:
|
||||||
|
- master
|
||||||
|
|
||||||
|
# Environment
|
||||||
|
environment:
|
||||||
|
PYTHON: 'C:\\Python36-x64'
|
||||||
|
BDIR: build-cmake
|
||||||
|
NINJA_URL: https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-win.zip
|
||||||
|
QTDIR: 'C:\Qt\5.9.1\msvc2015_64'
|
||||||
|
|
||||||
|
install:
|
||||||
|
- cmd: git submodule init && git submodule update
|
||||||
|
- cmd: if defined BDIR ( %PYTHON%\python.exe -m pip install meson && COPY %PYTHON%\Scripts\meson.py radare2\meson.py )
|
||||||
|
- cmd: if defined NINJA_URL ( powershell -Command wget %NINJA_URL% -OutFile radare2\ninja.zip && unzip radare2\ninja.zip -d radare2\ )
|
||||||
|
|
||||||
|
# Build r2 and generate sln
|
||||||
|
before_build:
|
||||||
|
- cmd: dir && dir radare2
|
||||||
|
- cmd: cd radare2 && set "PATH=%PYTHON%;%PATH%" && call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 && meson.bat --release && sys\meson_install.bat --with-static radare2_dist && cd ..
|
||||||
|
# Required because meson for windows creates .a
|
||||||
|
- cmd: cd radare2\radare2_dist && rename *.a *.lib && cd ..\..
|
||||||
|
# Build cutter
|
||||||
|
- cmd: set "PATH=%PATH%;%QTDIR%\bin;" && call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 && cd src && qmake -tp vc cutter.pro
|
||||||
|
- cmd: dir
|
||||||
|
|
||||||
|
# Build config
|
||||||
|
build:
|
||||||
|
project: src\cutter.vcxproj
|
||||||
|
|
||||||
|
# Tests
|
||||||
|
test: off
|
2
radare2
2
radare2
@ -1 +1 @@
|
|||||||
Subproject commit ba55d63373d69cfda0aa9736e99c78fa035326c3
|
Subproject commit 816a59e45228aca59e943c2b11974a329ad4280e
|
@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.1)
|
|||||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
|
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
|
||||||
include(DisallowInSource)
|
include(DisallowInSource)
|
||||||
|
|
||||||
project(cutter VERSION 1.0.0)
|
project(cutter VERSION 1.0)
|
||||||
|
|
||||||
set(CMAKE_CXX_STANDARD 11)
|
set(CMAKE_CXX_STANDARD 11)
|
||||||
|
|
||||||
|
@ -8,16 +8,18 @@
|
|||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
#include <QJsonDocument>
|
#include <QJsonDocument>
|
||||||
|
|
||||||
|
|
||||||
// Workaround for compile errors on Windows
|
// Workaround for compile errors on Windows
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#include <r2hacks.h>
|
#include <r2hacks.h>
|
||||||
#endif //_WIN32
|
#endif
|
||||||
|
|
||||||
#include "r_core.h"
|
#include "r_core.h"
|
||||||
|
|
||||||
//Workaround for compile errors on Windows.
|
// Workaround for compile errors on Windows
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#undef min
|
#undef min
|
||||||
|
#undef max
|
||||||
#endif //_WIN32
|
#endif //_WIN32
|
||||||
|
|
||||||
#define HAVE_LATEST_LIBR2 false
|
#define HAVE_LATEST_LIBR2 false
|
||||||
|
@ -3,13 +3,11 @@ TEMPLATE = app
|
|||||||
TARGET = cutter
|
TARGET = cutter
|
||||||
|
|
||||||
# The application version
|
# The application version
|
||||||
win32 {
|
|
||||||
VERSION = 1.0
|
VERSION = 1.0
|
||||||
|
win32 {
|
||||||
# Generate debug symbols in release mode
|
# Generate debug symbols in release mode
|
||||||
QMAKE_CXXFLAGS_RELEASE += -Zi # Compiler
|
QMAKE_CXXFLAGS_RELEASE += -Zi # Compiler
|
||||||
QMAKE_LFLAGS_RELEASE += /DEBUG # Linker
|
QMAKE_LFLAGS_RELEASE += /DEBUG # Linker
|
||||||
} else {
|
|
||||||
VERSION = 1.0-dev
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ICON = img/Enso.icns
|
ICON = img/Enso.icns
|
||||||
|
@ -9,6 +9,11 @@
|
|||||||
#include <QFileDialog>
|
#include <QFileDialog>
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
#undef min
|
||||||
|
#undef max
|
||||||
|
#endif
|
||||||
|
|
||||||
DisassemblerGraphView::DisassemblerGraphView(QWidget *parent, CutterCore *core)
|
DisassemblerGraphView::DisassemblerGraphView(QWidget *parent, CutterCore *core)
|
||||||
: QAbstractScrollArea(parent),
|
: QAbstractScrollArea(parent),
|
||||||
//currentGraph(duint(0)),
|
//currentGraph(duint(0)),
|
||||||
|
Loading…
Reference in New Issue
Block a user