1
0
Fork 0

GUI: Update QMake file

This commit is contained in:
Nukem 2015-10-17 17:53:53 -04:00
parent 2297a92935
commit 5c6a2efdf6
5 changed files with 81 additions and 89 deletions

43
.gitignore vendored
View File

@ -1,4 +1,4 @@
#ignore directories
# Ignored directories
bin/
obj/
ipch/
@ -10,8 +10,9 @@ debug/
*XE Results*/
doxygen*/
doc/
COV/
#global filetypes to ignore
# Global filetypes to ignore
*.depend
*.layout
*.patch
@ -30,16 +31,21 @@ doc/
*.pro.user.*
*.orig
cov-int*
COV/
*.pdb
ui_*
*.aps
*.pro.user
.DS_Store
#project to ignore
todo_bridge.txt
# Intel performance guide
*.ipgset
# Project to ignore
help/x64*dbg.chm
help/output/
#debugger files to ignore
# Debugger files to ignore
CppCheckResults.xml
x64_dbg_dbg/ODbgScript.chm
x64_dbg_dbg/ODbgScript.chw
x64_dbg_dbg/CppCheckResults.xml
@ -47,32 +53,11 @@ x64_dbg_dbg/.cccc/
x64_dbg_dbg/suggestions.txt
# For GUI
*.pro.user
x64_dbg_gui/DebuggerX64-build-Debug
x64_dbg_gui/DebuggerX64-build-Release
x64_dbg_gui/bin
x64_dbg_gui/Project/GeneratedFiles/
x64_dbg_gui/Project/release/
x64_dbg_gui/Project/Win32/
x64_dbg_gui/Project/x64/
x64_dbg_gui/Project/Makefile
x64_dbg_gui/Project/Makefile.Debug
x64_dbg_gui/Project/Makefile.Release
x64_dbg_gui/Project/Src/Bridge/libx32*bridge.a
x64_dbg_gui/Project/Src/Bridge/libx64*bridge.a
x64_dbg_gui/Project/Src/Bridge/x32*bridge.lib
x64_dbg_gui/Project/Src/Bridge/x64*bridge.lib
x64_dbg_gui/*/Makefile
x64_dbg_gui/*/Makefile.Debug
x64_dbg_gui/*/Makefile.Release
src/gui/build
src/gui/Makefile*
tools/
RCa*
*.aps
# Intel performance guide
*.ipgset
#exceptions
!/AStyleWhore.exe
!/AStyle.dll
.DS_Store

View File

@ -1,7 +1,7 @@
#ifndef IMPORTS_H
#define IMPORTS_H
#include "..\..\..\x64_dbg_bridge\bridgemain.h"
#include "..\..\..\x64_dbg_dbg\_dbgfunctions.h"
#include "bridge\bridgemain.h"
#include "dbg\_dbgfunctions.h"
#endif // IMPORTS_H

View File

@ -1,8 +0,0 @@
@echo off
rem Working directory: '%{sourceDir}'
rem argument1: architecture 'x32' or 'x64'
rem argument2: built binary directory '%{buildDir}\release' for example
echo Copying %2\%1gui.dll to ..\..\bin\%1\
copy %2\%1gui.dll ..\..\bin\%1\
echo Copying %2\%1gui.pdb to ..\..\bin\%1\
copy %2\%1gui.pdb ..\..\bin\%1\

View File

@ -1,9 +0,0 @@
@echo off
rem Working directory: '%{sourceDir}'
rem argument1: architecture 'x32' or 'x64'
set result=1
copy ..\..\bin\%1\lib%1bridge.a Src\Bridge\
if %ERRORLEVEL%==0 set result=0
copy ..\..\bin\%1\%1bridge.lib Src\Bridge\
if %ERRORLEVEL%==0 set result=0
exit %result%

View File

@ -4,28 +4,70 @@
#
#-------------------------------------------------
QT += core gui network
##
## Pre-defined global variables
##
X64_SRC_DIR = $$PWD/../ # Main /src/<PROJECT> directory relative to this project file.
# Contains dbg, exe, gui, bridge, and launcher.
!contains(QMAKE_HOST.arch, x86_64) {
X64_BIN_DIR = $$PWD/../../bin/x32 # Relative BIN path, 32-bit
X64_GEN_DIR = $$PWD/build/out32 # QMake temporary generated files, placed inside the build folder. (OBJ, UI, MOC)
TARGET = x32gui # Build x32gui
} else {
X64_BIN_DIR = $$PWD/../../bin/x64 # Relative BIN path, 64-bit
X64_GEN_DIR = $$PWD/build/out64 # QMake temporary generated files, placed inside the build folder. (OBJ, UI, MOC)
TARGET = x64gui # Build x64gui
}
##
## QMake output directories
##
DESTDIR = $${X64_BIN_DIR}
OBJECTS_DIR = $${X64_GEN_DIR}
MOC_DIR = $${X64_GEN_DIR}
RCC_DIR = $${X64_GEN_DIR}
UI_DIR = $${X64_GEN_DIR}
##
## QT libraries
##
# TODO: Remove networking because no one wants a firewall notice for a debugger
QT += core gui network
# QT5 requires widgets
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
# Removes all debug output when defined
#DEFINES += QT_NO_DEBUG_OUTPUT
#QMAKE_CFLAGS_RELEASE += -O3
#QMAKE_CXXFLAGS_RELEASE += -O3
#generate debug symbols in release mode
QMAKE_CFLAGS_RELEASE += -Zi
QMAKE_LFLAGS_RELEASE += /DEBUG
# Generate debug symbols in release mode
QMAKE_CFLAGS_RELEASE += -Zi #-O3 # C
QMAKE_CXXFLAGS_RELEASE += #-O3 # C++
QMAKE_LFLAGS_RELEASE += /DEBUG # Linker
!contains(QMAKE_HOST.arch, x86_64) {
TARGET = x32gui
} else {
TARGET = x64gui
}
DEFINES += BUILD_LIB
# Build as a library
DEFINES += BUILD_LIB NOMINMAX
TEMPLATE = lib
#TEMPLATE = app
# External include paths
INCLUDEPATH += \
$${X64_SRC_DIR} \
Src \
Src/Gui \
Src/BasicView \
Src/Disassembler \
Src/BeaEngine \
Src/ThirdPartyLibs/BeaEngine \
Src/ThirdPartyLibs/snowman \
Src/Memory \
Src/Bridge \
Src/Global \
Src/Utils
# Resources, sources, headers, and forms
RESOURCES += \
resource.qrc
SOURCES += \
Src/main.cpp \
@ -179,19 +221,6 @@ HEADERS += \
Src/Gui/NotesManager.h \
Src/Gui/NotepadView.h
INCLUDEPATH += \
Src \
Src/Gui \
Src/BasicView \
Src/Disassembler \
Src/BeaEngine \
Src/ThirdPartyLibs/BeaEngine \
Src/Memory \
Src/Bridge \
Src/Global \
Src/Utils
FORMS += \
Src/Gui/MainWindow.ui \
Src/Gui/CPUWidget.ui \
@ -217,26 +246,21 @@ FORMS += \
Src/Gui/DataCopyDialog.ui \
Src/Gui/EntropyDialog.ui
INCLUDEPATH += $$PWD/Src/Bridge
INCLUDEPATH += $$PWD/Src/ThirdPartyLibs/snowman
# Libraries
LIBS += -luser32
DEFINES += NOMINMAX
!contains(QMAKE_HOST.arch, x86_64) {
#message("x86 build")
## Windows x86 (32bit) specific build here
#
# Windows x86 (32bit) specific build
#
LIBS += -L"$$PWD/Src/ThirdPartyLibs/BeaEngine/" -lBeaEngine
LIBS += -L"$$PWD/Src/Bridge/" -lx32bridge
LIBS += -L"$$PWD/Src/ThirdPartyLibs/snowman/" -lsnowman_x86
LIBS += -L"$${X64_BIN_DIR}" -lx32bridge
} else {
#message("x86_64 build")
## Windows x64 (64bit) specific build here
#
# Windows x64 (64bit) specific build
#
LIBS += -L"$$PWD/Src/ThirdPartyLibs/BeaEngine/" -lBeaEngine_64
LIBS += -L"$$PWD/Src/Bridge/" -lx64bridge
LIBS += -L"$$PWD/Src/ThirdPartyLibs/snowman/" -lsnowman_x64
LIBS += -L"$${X64_BIN_DIR}" -lx64bridge
}
RESOURCES += \
resource.qrc