Skip to content

Commit

Permalink
Added appveyor build (radareorg#29)
Browse files Browse the repository at this point in the history
  • Loading branch information
xarkes authored Oct 3, 2017
1 parent d764dd9 commit 4e9d0d0
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 8 deletions.
42 changes: 42 additions & 0 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 1 deletion radare2
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.1)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
include(DisallowInSource)

project(cutter VERSION 1.0.0)
project(cutter VERSION 1.0)

set(CMAKE_CXX_STANDARD 11)

Expand Down
8 changes: 5 additions & 3 deletions src/cutter.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,18 @@
#include <QMessageBox>
#include <QJsonDocument>

//Workaround for compile errors on Windows

// Workaround for compile errors on Windows
#ifdef _WIN32
#include <r2hacks.h>
#endif //_WIN32
#endif

#include "r_core.h"

//Workaround for compile errors on Windows.
// Workaround for compile errors on Windows
#ifdef _WIN32
#undef min
#undef max
#endif //_WIN32

#define HAVE_LATEST_LIBR2 false
Expand Down
4 changes: 1 addition & 3 deletions src/cutter.pro
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@ TEMPLATE = app
TARGET = cutter

# The application version
VERSION = 1.0
win32 {
VERSION = 1.0
# Generate debug symbols in release mode
QMAKE_CXXFLAGS_RELEASE += -Zi # Compiler
QMAKE_LFLAGS_RELEASE += /DEBUG # Linker
} else {
VERSION = 1.0-dev
}

ICON = img/Enso.icns
Expand Down
5 changes: 5 additions & 0 deletions src/widgets/DisassemblerGraphView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@
#include <QFileDialog>
#include <QMessageBox>

#ifdef _WIN32
#undef min
#undef max
#endif

DisassemblerGraphView::DisassemblerGraphView(QWidget *parent, CutterCore *core)
: QAbstractScrollArea(parent),
//currentGraph(duint(0)),
Expand Down

0 comments on commit 4e9d0d0

Please sign in to comment.