x64dbg/x64dbg
x64dbg
/
x64dbg
1
0
Fork 0
Code Releases 2 Activity

PROJECT+DBG+GUI: re-added libs + fixed build+clean+release scripts + removed BeaTokenizer from the GUI.

This commit is contained in:
Mr. eXoDia 2015-11-07 07:29:35 +01:00
parent 9a66825db5
commit ca0dbcd7c1
23 changed files with 46 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -52,6 +52,7 @@ src/gui/build
src/gui/Makefile*
tools/
RCa*
src/build-*/
# Exceptions
!/hooks/AStyleWhore.exe

30
build.bat
View File

@ -1,9 +1,12 @@
@echo off
echo Saving PATH
if "%OLDPATH%"=="" set OLDPATH=%PATH%
cd %~dp0
if /i "%1"=="x32" call setenv.bat x32&set type="Release|Win32"&goto build
if /i "%1"=="x64" call setenv.bat x64&set type="Release|x64"&goto build
if /i "%1"=="x32" call setenv.bat x32&set type=Configuration=Release;Platform=Win32&goto build
if /i "%1"=="x64" call setenv.bat x64&set type=Configuration=Release;Platform=x64&goto build
if /i "%1"=="coverity" goto coverity
if /i "%1"=="doxygen" call setenv.bat doxygen&goto doxygen
if /i "%1"=="chm" call setenv.bat chm&goto chm
@ -13,15 +16,15 @@ goto usage
:build
echo Building DBG...
devenv /Rebuild %type% x64dbg.sln
msbuild.exe x64dbg.sln /m /verbosity:minimal /t:Rebuild /p:%type%
echo Building GUI...
cd /src/gui
rmdir /S /Q src\build
cd src\gui
qmake x64dbg.pro CONFIG+=release
jom
cd ..
cd ..
goto :EOF
cd ..\..
goto :restorepath
:coverity
@ -34,17 +37,17 @@ call setenv.bat coverity
echo Building with Coverity
cov-configure --msvc
cov-build --dir cov-int --instrument build.bat %2%
goto :EOF
goto :restorepath
:doxygen
doxygen
goto :EOF
goto :restorepath
:chm
start /w "" winchm.exe help\x64_dbg.wcp /h
goto :EOF
goto :restorepath
:usage
@ -57,4 +60,9 @@ echo build.bat coverity x32 : builds 32-bit coverity build
echo build.bat coverity x64 : builds 64-bit coverity build
echo build.bat doxygen : generate doxygen documentation
echo build.bat chm : generate windows help format documentation
goto :EOF
goto :restorepath
:restorepath
echo Resetting PATH
set PATH=%OLDPATH%
set OLDPATH=

25
clean.bat
View File

@ -6,25 +6,34 @@ del /Q *.layout
del /Q /A H *.suo
rmdir /S /Q ipch
rmdir /S /Q release
rmdir /S /Q build
rmdir /S /Q cov-int
echo Cleaning SRC...
rmdir /S /Q src\build
echo Cleaning BRIDGE...
cd src/bridge
cd src\bridge
call :delfiles
echo Cleaning DBG...
cd src/dbg
cd src\dbg
call :delfiles
echo Cleaning EXE...
cd src/exe
cd src\exe
call :delfiles
echo Cleaning LAUNCHER...
cd src\launcher
call :delfiles
echo Cleaning GUI...
cd src/gui
rmdir /S /Q build
del /Q Makefile*
cd ..
cd ..
del /Q *.pdb
cd ..\..
echo Cleaning bin\
del /Q bin\*.pdb
@ -66,8 +75,6 @@ rmdir /S /Q output
echo Done!
exit 0
:delfiles
rmdir /S /Q obj
rmdir /S /Q Win32
@ -75,5 +82,5 @@ rmdir /S /Q x64
del /Q *.bmarks
del /Q *.layout
del /Q *.depend
cd ..
cd ..
del /Q *.pdb
cd ..\..

42
setenv.bat
View File

@ -1,8 +1,11 @@
@echo off
if "%OLDPATH%"=="" set OLDPATH=%PATH%
if "%QT32PATH%"=="" set QT32PATH=c:\Qt\qt-4.8.6-x86-msvc2013\qt-4.8.6-x86-msvc2013\bin
if "%QT64PATH%"=="" set QT64PATH=c:\Qt\qt-4.8.6-x64-msvc2013\qt-4.8.6-x64-msvc2013\bin
if "%QTCREATORPATH%"=="" set QTCREATORPATH=c:\Qt\qtcreator-3.1.1\bin
if "%VSVARSALLPATH%"=="" set VSVARSALLPATH=c:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat
if "%COVERITYPATH%"=="" set COVERITYPATH=c:\coverity\bin
if "%DOXYGENPATH%"=="" set DOXYGENPATH=C:\Program Files\doxygen\bin
if "%CHMPATH%"=="" set CHMPATH=c:\Program Files (x86)\Softany\WinCHM
@ -27,7 +30,7 @@ echo Setting Qt in PATH
set PATH=%PATH%;%QT32PATH%
set PATH=%PATH%;%QTCREATORPATH%
echo Setting VS in PATH
call :vc-set-2013
call "%VSVARSALLPATH%"
goto :eof
:x64
@ -35,7 +38,7 @@ echo Setting Qt in PATH
set PATH=%PATH%;%QT64PATH%
set PATH=%PATH%;%QTCREATORPATH%
echo Setting VS in PATH
call :vc-set-2013 amd64
call "%VSVARSALLPATH%" amd64
goto :eof
:coverity
@ -51,37 +54,4 @@ goto :eof
:chm
echo Setting CHM in PATH
set PATH=%PATH%;%CHMPATH%
goto :eof
@rem Look for Visual Studio 2015
:vc-set-2015
if not defined VS140COMNTOOLS goto vc-set-2013
if not exist "%VS140COMNTOOLS%\..\..\vc\vcvarsall.bat" goto vc-set-2013
if "%VCVARS_VER%" NEQ "140" (
call "%VS140COMNTOOLS%\..\..\vc\vcvarsall.bat" %1%
SET VCVARS_VER=140
)
if not defined VCINSTALLDIR goto msbuild-not-found
set GYP_MSVS_VERSION=2015
goto msbuild-found
@rem Look for Visual Studio 2013
:vc-set-2013
if not defined VS120COMNTOOLS goto goto msbuild-not-found
if not exist "%VS120COMNTOOLS%\..\..\vc\vcvarsall.bat" goto msbuild-not-found
if "%VCVARS_VER%" NEQ "120" (
call "%VS120COMNTOOLS%\..\..\vc\vcvarsall.bat" %1%
SET VCVARS_VER=120
)
if not defined VCINSTALLDIR goto msbuild-not-found
set GYP_MSVS_VERSION=2013
goto msbuild-found
:msbuild-found
goto :EOF
:msbuild-not-found
echo ERROR: Visual Studio 2013/2015 wasn't found!
exit 1
goto :eof

BIN
src/dbg/DeviceNameResolver/DeviceNameResolver_x64.lib Normal file
View File

Binary file not shown.

BIN
src/dbg/DeviceNameResolver/DeviceNameResolver_x86.lib Normal file
View File

Binary file not shown.

BIN
src/dbg/TitanEngine/TitanEngine_x64.lib Normal file
View File

Binary file not shown.

BIN
src/dbg/TitanEngine/TitanEngine_x86.lib Normal file
View File

Binary file not shown.

BIN
src/dbg/XEDParse/XEDParse_x64.lib Normal file
View File

Binary file not shown.

BIN
src/dbg/XEDParse/XEDParse_x86.lib Normal file
View File

Binary file not shown.

BIN
src/dbg/capstone/capstone_x64.lib Normal file
View File

Binary file not shown.

BIN
src/dbg/capstone/capstone_x86.lib Normal file
View File

Binary file not shown.

BIN
src/dbg/dbghelp/dbghelp_x64.lib Normal file
View File

Binary file not shown.

BIN
src/dbg/dbghelp/dbghelp_x86.lib Normal file
View File

Binary file not shown.

BIN
src/dbg/jansson/jansson_x64.lib Normal file
View File

Binary file not shown.

BIN
src/dbg/jansson/jansson_x86.lib Normal file
View File

Binary file not shown.

BIN
src/dbg/lz4/lz4_x64.lib Normal file
View File

Binary file not shown.

BIN
src/dbg/lz4/lz4_x86.lib Normal file
View File

Binary file not shown.

BIN
src/dbg/yara/yara_x64.lib Normal file
View File

Binary file not shown.

BIN
src/dbg/yara/yara_x86.lib Normal file
View File

Binary file not shown.

BIN
src/gui/Src/ThirdPartyLibs/snowman/snowman_x64.lib Normal file
View File

Binary file not shown.

BIN
src/gui/Src/ThirdPartyLibs/snowman/snowman_x86.lib Normal file
View File

Binary file not shown.

9
src/gui/x64dbg.pro
View File

@ -12,11 +12,11 @@ X64_SRC_DIR = $$PWD/../ # Main /src/<PROJECT> directory relative
!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)
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)
X64_GEN_DIR = $$PWD/../build/out64 # QMake temporary generated files, placed inside the build folder. (OBJ, UI, MOC)
TARGET = x64gui # Build x64gui
}
@ -188,7 +188,6 @@ HEADERS += \
Src/Utils/Configuration.h \
Src/Gui/CPUSideBar.h \
Src/Gui/AppearanceDialog.h \
Src/Disassembler/BeaTokenizer.h \
Src/Gui/CloseDialog.h \
Src/Gui/HexEditDialog.h \
Src/QHexEdit/ArrayCommand.h \
@ -253,12 +252,12 @@ LIBS += -luser32
!contains(QMAKE_HOST.arch, x86_64) {
# Windows x86 (32bit) specific build
LIBS += -L"$$PWD/Src/ThirdPartyLibs/capstone/" -lcapstone_x86
LIBS += -L"$${X64_SRC_DIR}/dbg/capstone/" -lcapstone_x86
LIBS += -L"$$PWD/Src/ThirdPartyLibs/snowman/" -lsnowman_x86
LIBS += -L"$${X64_BIN_DIR}" -lx32bridge
} else {
# Windows x64 (64bit) specific build
LIBS += -L"$$PWD/Src/ThirdPartyLibs/capstone/" -lcapstone_x64
LIBS += -L"$${X64_SRC_DIR}/dbg/capstone/" -lcapstone_x64
LIBS += -L"$$PWD/Src/ThirdPartyLibs/snowman/" -lsnowman_x64
LIBS += -L"$${X64_BIN_DIR}" -lx64bridge
}