full rename from "x64_dbg" to "x64dbg" (including output filenames)
This commit is contained in:
parent
b7d3a5f02e
commit
1a0f112b66
|
@ -36,7 +36,7 @@ ui_*
|
|||
|
||||
#project to ignore
|
||||
todo_bridge.txt
|
||||
help/x64_dbg.chm
|
||||
help/x64*dbg.chm
|
||||
help/output/
|
||||
|
||||
#debugger files to ignore
|
||||
|
@ -58,10 +58,10 @@ 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/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
|
||||
|
|
27
clean.bat
27
clean.bat
|
@ -40,10 +40,10 @@ rmdir /S /Q Project\release
|
|||
rmdir /S /Q Project\debug
|
||||
rmdir /S /Q Project\Win32
|
||||
rmdir /S /Q Project\x64
|
||||
del /Q Project\Src\Bridge\libx32_bridge.a
|
||||
del /Q Project\Src\Bridge\libx64_bridge.a
|
||||
del /Q Project\Src\Bridge\x32_bridge.lib
|
||||
del /Q Project\Src\Bridge\x64_bridge.lib
|
||||
del /Q Project\Src\Bridge\libx32bridge.a
|
||||
del /Q Project\Src\Bridge\libx64bridge.a
|
||||
del /Q Project\Src\Bridge\x32bridge.lib
|
||||
del /Q Project\Src\Bridge\x64bridge.lib
|
||||
cd ..
|
||||
echo cleaning bin\
|
||||
del /Q bin\*.pdb
|
||||
|
@ -59,10 +59,10 @@ del /Q bin\x32\*.exp
|
|||
del /Q bin\x32\*.a
|
||||
del /Q bin\x32\*.lib
|
||||
del /Q bin\x32\*.def
|
||||
del /Q bin\x32\x32_dbg.exe
|
||||
del /Q bin\x32\x32_dbg.dll
|
||||
del /Q bin\x32\x32_gui.dll
|
||||
del /Q bin\x32\x32_bridge.dll
|
||||
del /Q bin\x32\x32dbg.exe
|
||||
del /Q bin\x32\x32dbg.dll
|
||||
del /Q bin\x32\x32gui.dll
|
||||
del /Q bin\x32\x32bridge.dll
|
||||
echo cleaning bin\x64...
|
||||
rmdir /S /Q bin\x64\db
|
||||
del /Q bin\x64\*.pdb
|
||||
|
@ -70,12 +70,11 @@ del /Q bin\x64\*.exp
|
|||
del /Q bin\x64\*.a
|
||||
del /Q bin\x64\*.lib
|
||||
del /Q bin\x64\*.def
|
||||
del /Q bin\x64\x64_dbg.exe
|
||||
del /Q bin\x64\x64_dbg.dll
|
||||
del /Q bin\x64\x64_gui.dll
|
||||
del /Q bin\x64\x64_bridge.dll
|
||||
del /Q bin\x64\x64dbg.exe
|
||||
del /Q bin\x64\x64dbg.dll
|
||||
del /Q bin\x64\x64gui.dll
|
||||
del /Q bin\x64\x64bridge.dll
|
||||
echo cleaning help...
|
||||
cd help
|
||||
del /Q *.chm
|
||||
rmdir /S /Q output
|
||||
exit 0
|
||||
rmdir /S /Q output
|
BIN
help/x64_dbg.wcp
BIN
help/x64_dbg.wcp
Binary file not shown.
68
release.bat
68
release.bat
|
@ -22,6 +22,8 @@ mkdir %RELEASEDIR%\bin_base
|
|||
mkdir %RELEASEDIR%\bin_base\x32
|
||||
mkdir %RELEASEDIR%\bin_base\x64
|
||||
|
||||
copy bin\x32\x32_bridge.dll %RELEASEDIR%\bin_base\x32\x32_bridge.dll
|
||||
copy bin\x32\x32_dbg.dll %RELEASEDIR%\bin_base\x32\x32_dbg.dll
|
||||
copy bin\x32\BeaEngine.dll %RELEASEDIR%\bin_base\x32\BeaEngine.dll
|
||||
copy bin\x32\dbghelp.dll %RELEASEDIR%\bin_base\x32\dbghelp.dll
|
||||
copy bin\x32\symsrv.dll %RELEASEDIR%\bin_base\x32\symsrv.dll
|
||||
|
@ -32,6 +34,8 @@ copy bin\x32\lz4.dll %RELEASEDIR%\bin_base\x32\lz4.dll
|
|||
copy bin\x32\TitanEngine.dll %RELEASEDIR%\bin_base\x32\TitanEngine.dll
|
||||
copy bin\x32\XEDParse.dll %RELEASEDIR%\bin_base\x32\XEDParse.dll
|
||||
copy bin\x32\yara.dll %RELEASEDIR%\bin_base\x32\yara.dll
|
||||
copy bin\x64\x64_bridge.dll %RELEASEDIR%\bin_base\x64\x64_bridge.dll
|
||||
copy bin\x64\x64_dbg.dll %RELEASEDIR%\bin_base\x64\x64_dbg.dll
|
||||
copy bin\x64\BeaEngine.dll %RELEASEDIR%\bin_base\x64\BeaEngine.dll
|
||||
copy bin\x64\dbghelp.dll %RELEASEDIR%\bin_base\x64\dbghelp.dll
|
||||
copy bin\x64\symsrv.dll %RELEASEDIR%\bin_base\x64\symsrv.dll
|
||||
|
@ -47,7 +51,7 @@ echo help
|
|||
|
||||
mkdir %RELEASEDIR%\help
|
||||
|
||||
copy help\x64_dbg.chm %RELEASEDIR%\help
|
||||
copy help\x64dbg.chm %RELEASEDIR%\help
|
||||
|
||||
echo pluginsdk
|
||||
|
||||
|
@ -76,29 +80,29 @@ copy x64_dbg_dbg\_plugins.h %RELEASEDIR%\pluginsdk\_plugins.h
|
|||
copy x64_dbg_dbg\_dbgfunctions.h %RELEASEDIR%\pluginsdk\_dbgfunctions.h
|
||||
copy x64_dbg_bridge\bridgemain.h %RELEASEDIR%\pluginsdk\bridgemain.h
|
||||
|
||||
genlib bin\x32\x32_bridge.dll
|
||||
copy x32_bridge.a %RELEASEDIR%\pluginsdk\libx32_bridge.a
|
||||
del x32_bridge.def
|
||||
del x32_bridge.a
|
||||
copy bin\x32\x32_bridge.lib %RELEASEDIR%\pluginsdk\x32_bridge.lib
|
||||
genlib bin\x32\x32bridge.dll
|
||||
copy x32bridge.a %RELEASEDIR%\pluginsdk\libx32bridge.a
|
||||
del x32bridge.def
|
||||
del x32bridge.a
|
||||
copy bin\x32\x32bridge.lib %RELEASEDIR%\pluginsdk\x32bridge.lib
|
||||
|
||||
genlib bin\x32\x32_dbg.dll
|
||||
copy x32_dbg.a %RELEASEDIR%\pluginsdk\libx32_dbg.a
|
||||
del x32_dbg.def
|
||||
del x32_dbg.a
|
||||
copy bin\x32\x32_dbg.lib %RELEASEDIR%\pluginsdk\x32_dbg.lib
|
||||
genlib bin\x32\x32dbg.dll
|
||||
copy x32dbg.a %RELEASEDIR%\pluginsdk\libx32dbg.a
|
||||
del x32dbg.def
|
||||
del x32dbg.a
|
||||
copy bin\x32\x32dbg.lib %RELEASEDIR%\pluginsdk\x32dbg.lib
|
||||
|
||||
genlib bin\x64\x64_bridge.dll
|
||||
copy x64_bridge.a %RELEASEDIR%\pluginsdk\libx64_bridge.a
|
||||
del x64_bridge.def
|
||||
del x64_bridge.a
|
||||
copy bin\x64\x64_bridge.lib %RELEASEDIR%\pluginsdk\x64_bridge.lib
|
||||
genlib bin\x64\x64bridge.dll
|
||||
copy x64bridge.a %RELEASEDIR%\pluginsdk\libx64bridge.a
|
||||
del x64bridge.def
|
||||
del x64bridge.a
|
||||
copy bin\x64\x64bridge.lib %RELEASEDIR%\pluginsdk\x64bridge.lib
|
||||
|
||||
genlib bin\x64\x64_dbg.dll
|
||||
copy x64_dbg.a %RELEASEDIR%\pluginsdk\libx64_dbg.a
|
||||
del x64_dbg.def
|
||||
del x64_dbg.a
|
||||
copy bin\x64\x64_dbg.lib %RELEASEDIR%\pluginsdk\x64_dbg.lib
|
||||
genlib bin\x64\x64dbg.dll
|
||||
copy x64dbg.a %RELEASEDIR%\pluginsdk\libx64dbg.a
|
||||
del x64dbg.def
|
||||
del x64dbg.a
|
||||
copy bin\x64\x64dbg.lib %RELEASEDIR%\pluginsdk\x64dbg.lib
|
||||
|
||||
echo release
|
||||
|
||||
|
@ -106,18 +110,16 @@ mkdir %RELEASEDIR%\release
|
|||
mkdir %RELEASEDIR%\release\x32
|
||||
mkdir %RELEASEDIR%\release\x64
|
||||
|
||||
copy bin\x96_dbg.exe %RELEASEDIR%\release\x96_dbg.exe
|
||||
copy bin\x32\x32_bridge.dll %RELEASEDIR%\release\x32\x32_bridge.dll
|
||||
copy bin\x32\x32_dbg.dll %RELEASEDIR%\release\x32\x32_dbg.dll
|
||||
copy bin\x32\x32_dbg.exe %RELEASEDIR%\release\x32\x32_dbg.exe
|
||||
copy bin\x32\x32_gui.dll %RELEASEDIR%\release\x32\x32_gui.dll
|
||||
copy bin\x64\x64_bridge.dll %RELEASEDIR%\release\x64\x64_bridge.dll
|
||||
copy bin\x64\x64_dbg.dll %RELEASEDIR%\release\x64\x64_dbg.dll
|
||||
copy bin\x64\x64_dbg.exe %RELEASEDIR%\release\x64\x64_dbg.exe
|
||||
copy bin\x64\x64_gui.dll %RELEASEDIR%\release\x64\x64_gui.dll
|
||||
copy bin\x96dbg.exe %RELEASEDIR%\release\x96dbg.exe
|
||||
copy bin\x32\x32bridge.dll %RELEASEDIR%\release\x32\x32bridge.dll
|
||||
copy bin\x32\x32dbg.dll %RELEASEDIR%\release\x32\x32dbg.dll
|
||||
copy bin\x32\x32dbg.exe %RELEASEDIR%\release\x32\x32dbg.exe
|
||||
copy bin\x32\x32gui.dll %RELEASEDIR%\release\x32\x32gui.dll
|
||||
copy bin\x64\x64bridge.dll %RELEASEDIR%\release\x64\x64bridge.dll
|
||||
copy bin\x64\x64dbg.dll %RELEASEDIR%\release\x64\x64dbg.dll
|
||||
copy bin\x64\x64dbg.exe %RELEASEDIR%\release\x64\x64dbg.exe
|
||||
copy bin\x64\x64gui.dll %RELEASEDIR%\release\x64\x64gui.dll
|
||||
|
||||
xcopy %RELEASEDIR%\qt_base %RELEASEDIR%\release /S /Y
|
||||
xcopy %RELEASEDIR%\bin_base %RELEASEDIR%\release /S /Y
|
||||
xcopy %RELEASEDIR%\help %RELEASEDIR%\release /S /Y
|
||||
|
||||
exit 0
|
||||
xcopy %RELEASEDIR%\help %RELEASEDIR%\release /S /Y
|
|
@ -15,11 +15,11 @@ static wchar_t szIniFile[MAX_PATH] = L"";
|
|||
static CRITICAL_SECTION csIni;
|
||||
|
||||
#ifdef _WIN64
|
||||
#define dbg_lib "x64_dbg.dll"
|
||||
#define gui_lib "x64_gui.dll"
|
||||
#define dbg_lib "x64dbg.dll"
|
||||
#define gui_lib "x64gui.dll"
|
||||
#else
|
||||
#define dbg_lib "x32_dbg.dll"
|
||||
#define gui_lib "x32_gui.dll"
|
||||
#define dbg_lib "x32dbg.dll"
|
||||
#define gui_lib "x32gui.dll"
|
||||
#endif // _WIN64
|
||||
|
||||
#define LOADLIBRARY(name) \
|
||||
|
|
|
@ -72,23 +72,23 @@
|
|||
<LinkIncremental>false</LinkIncremental>
|
||||
<OutDir>$(SolutionDir)bin\x32\</OutDir>
|
||||
<IntDir>$(Platform)\$(Configuration)\</IntDir>
|
||||
<TargetName>x32_bridge</TargetName>
|
||||
<TargetName>x32bridge</TargetName>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
<OutDir>$(SolutionDir)bin\x32\</OutDir>
|
||||
<IntDir>$(Platform)\$(Configuration)\</IntDir>
|
||||
<TargetName>x32_bridge</TargetName>
|
||||
<TargetName>x32bridge</TargetName>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
<OutDir>$(SolutionDir)bin\x64\</OutDir>
|
||||
<TargetName>x64_bridge</TargetName>
|
||||
<TargetName>x64bridge</TargetName>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
<OutDir>$(SolutionDir)bin\x64\</OutDir>
|
||||
<TargetName>x64_bridge</TargetName>
|
||||
<TargetName>x64bridge</TargetName>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<ClCompile>
|
||||
|
|
|
@ -1,22 +1,22 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<LocalDebuggerCommand>$(OutDir)\x32_dbg.exe</LocalDebuggerCommand>
|
||||
<LocalDebuggerCommand>$(OutDir)\x32dbg.exe</LocalDebuggerCommand>
|
||||
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||
<LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LocalDebuggerCommand>$(OutDir)\x32_dbg.exe</LocalDebuggerCommand>
|
||||
<LocalDebuggerCommand>$(OutDir)\x32dbg.exe</LocalDebuggerCommand>
|
||||
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||
<LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<LocalDebuggerCommand>$(OutDir)\x64_dbg.exe</LocalDebuggerCommand>
|
||||
<LocalDebuggerCommand>$(OutDir)\x64dbg.exe</LocalDebuggerCommand>
|
||||
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||
<LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<LocalDebuggerCommand>$(OutDir)\x64_dbg.exe</LocalDebuggerCommand>
|
||||
<LocalDebuggerCommand>$(OutDir)\x64dbg.exe</LocalDebuggerCommand>
|
||||
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||
<LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
|
||||
</PropertyGroup>
|
||||
|
|
|
@ -199,23 +199,23 @@
|
|||
<LinkIncremental>false</LinkIncremental>
|
||||
<OutDir>$(SolutionDir)bin\x32\</OutDir>
|
||||
<IntDir>$(Platform)\$(Configuration)\</IntDir>
|
||||
<TargetName>x32_dbg</TargetName>
|
||||
<TargetName>x32dbg</TargetName>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
<OutDir>$(SolutionDir)bin\x32\</OutDir>
|
||||
<IntDir>$(Platform)\$(Configuration)\</IntDir>
|
||||
<TargetName>x32_dbg</TargetName>
|
||||
<TargetName>x32dbg</TargetName>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
<OutDir>$(SolutionDir)bin\x64\</OutDir>
|
||||
<TargetName>x64_dbg</TargetName>
|
||||
<TargetName>x64dbg</TargetName>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
<OutDir>$(SolutionDir)bin\x64\</OutDir>
|
||||
<TargetName>x64_dbg</TargetName>
|
||||
<TargetName>x64dbg</TargetName>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<ClCompile>
|
||||
|
@ -239,7 +239,7 @@
|
|||
<SubSystem>Windows</SubSystem>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<AdditionalDependencies>yara\yara_x86.lib;lz4\lz4_x86.lib;jansson\jansson_x86.lib;DeviceNameResolver\DeviceNameResolver_x86.lib;XEDParse\XEDParse_x86.lib;$(SolutionDir)bin\x32\x32_bridge.lib;dbghelp\dbghelp_x86.lib;TitanEngine\TitanEngine_x86.lib;BeaEngine\BeaEngine.lib;psapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>yara\yara_x86.lib;lz4\lz4_x86.lib;jansson\jansson_x86.lib;DeviceNameResolver\DeviceNameResolver_x86.lib;XEDParse\XEDParse_x86.lib;$(SolutionDir)bin\x32\x32bridge.lib;dbghelp\dbghelp_x86.lib;TitanEngine\TitanEngine_x86.lib;BeaEngine\BeaEngine.lib;psapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
|
@ -260,7 +260,7 @@
|
|||
<SubSystem>Windows</SubSystem>
|
||||
<EnableCOMDATFolding>false</EnableCOMDATFolding>
|
||||
<OptimizeReferences>false</OptimizeReferences>
|
||||
<AdditionalDependencies>yara\yara_x86.lib;lz4\lz4_x86.lib;jansson\jansson_x86.lib;DeviceNameResolver\DeviceNameResolver_x86.lib;XEDParse\XEDParse_x86.lib;$(SolutionDir)bin\x32\x32_bridge.lib;dbghelp\dbghelp_x86.lib;TitanEngine\TitanEngine_x86.lib;BeaEngine\BeaEngine.lib;psapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>yara\yara_x86.lib;lz4\lz4_x86.lib;jansson\jansson_x86.lib;DeviceNameResolver\DeviceNameResolver_x86.lib;XEDParse\XEDParse_x86.lib;$(SolutionDir)bin\x32\x32bridge.lib;dbghelp\dbghelp_x86.lib;TitanEngine\TitanEngine_x86.lib;BeaEngine\BeaEngine.lib;psapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
|
@ -287,7 +287,7 @@
|
|||
<SubSystem>Windows</SubSystem>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<AdditionalDependencies>yara\yara_x64.lib;lz4\lz4_x64.lib;jansson\jansson_x64.lib;DeviceNameResolver\DeviceNameResolver_x64.lib;XEDParse\XEDParse_x64.lib;$(SolutionDir)bin\x64\x64_bridge.lib;dbghelp\dbghelp_x64.lib;TitanEngine\TitanEngine_x64.lib;BeaEngine\BeaEngine_64.lib;psapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>yara\yara_x64.lib;lz4\lz4_x64.lib;jansson\jansson_x64.lib;DeviceNameResolver\DeviceNameResolver_x64.lib;XEDParse\XEDParse_x64.lib;$(SolutionDir)bin\x64\x64bridge.lib;dbghelp\dbghelp_x64.lib;TitanEngine\TitanEngine_x64.lib;BeaEngine\BeaEngine_64.lib;psapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
|
@ -311,7 +311,7 @@
|
|||
<SubSystem>Windows</SubSystem>
|
||||
<EnableCOMDATFolding>false</EnableCOMDATFolding>
|
||||
<OptimizeReferences>false</OptimizeReferences>
|
||||
<AdditionalDependencies>yara\yara_x64.lib;lz4\lz4_x64.lib;jansson\jansson_x64.lib;DeviceNameResolver\DeviceNameResolver_x64.lib;XEDParse\XEDParse_x64.lib;$(SolutionDir)bin\x64\x64_bridge.lib;dbghelp\dbghelp_x64.lib;TitanEngine\TitanEngine_x64.lib;BeaEngine\BeaEngine_64.lib;psapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>yara\yara_x64.lib;lz4\lz4_x64.lib;jansson\jansson_x64.lib;DeviceNameResolver\DeviceNameResolver_x64.lib;XEDParse\XEDParse_x64.lib;$(SolutionDir)bin\x64\x64bridge.lib;dbghelp\dbghelp_x64.lib;TitanEngine\TitanEngine_x64.lib;BeaEngine\BeaEngine_64.lib;psapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
|
|
|
@ -1,22 +1,22 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<LocalDebuggerCommand>$(OutDir)\x32_dbg.exe</LocalDebuggerCommand>
|
||||
<LocalDebuggerCommand>$(OutDir)\x32dbg.exe</LocalDebuggerCommand>
|
||||
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||
<LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LocalDebuggerCommand>$(OutDir)\x32_dbg.exe</LocalDebuggerCommand>
|
||||
<LocalDebuggerCommand>$(OutDir)\x32dbg.exe</LocalDebuggerCommand>
|
||||
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||
<LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<LocalDebuggerCommand>$(OutDir)\x64_dbg.exe</LocalDebuggerCommand>
|
||||
<LocalDebuggerCommand>$(OutDir)\x64dbg.exe</LocalDebuggerCommand>
|
||||
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||
<LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<LocalDebuggerCommand>$(OutDir)\x64_dbg.exe</LocalDebuggerCommand>
|
||||
<LocalDebuggerCommand>$(OutDir)\x64dbg.exe</LocalDebuggerCommand>
|
||||
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||
<LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
|
||||
</PropertyGroup>
|
||||
|
|
|
@ -79,26 +79,26 @@
|
|||
<LinkIncremental>false</LinkIncremental>
|
||||
<OutDir>$(SolutionDir)bin\x32\</OutDir>
|
||||
<IntDir>$(Platform)\$(Configuration)\</IntDir>
|
||||
<TargetName>x32_dbg</TargetName>
|
||||
<TargetName>x32dbg</TargetName>
|
||||
<GenerateManifest>false</GenerateManifest>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
<OutDir>$(SolutionDir)bin\x32\</OutDir>
|
||||
<IntDir>$(Platform)\$(Configuration)\</IntDir>
|
||||
<TargetName>x32_dbg</TargetName>
|
||||
<TargetName>x32dbg</TargetName>
|
||||
<GenerateManifest>false</GenerateManifest>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
<OutDir>$(SolutionDir)bin\x64\</OutDir>
|
||||
<TargetName>x64_dbg</TargetName>
|
||||
<TargetName>x64dbg</TargetName>
|
||||
<GenerateManifest>false</GenerateManifest>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
<OutDir>$(SolutionDir)bin\x64\</OutDir>
|
||||
<TargetName>x64_dbg</TargetName>
|
||||
<TargetName>x64dbg</TargetName>
|
||||
<GenerateManifest>false</GenerateManifest>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
|
@ -114,7 +114,7 @@
|
|||
<SubSystem>Windows</SubSystem>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<AdditionalDependencies>$(SolutionDir)bin\x32\x32_bridge.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>$(SolutionDir)bin\x32\x32bridge.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<ProgramDatabaseFile>$(TargetDir)$(TargetName)_exe.pdb</ProgramDatabaseFile>
|
||||
<AdditionalManifestDependencies>
|
||||
</AdditionalManifestDependencies>
|
||||
|
@ -133,7 +133,7 @@
|
|||
<SubSystem>Windows</SubSystem>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<AdditionalDependencies>$(SolutionDir)bin\x32\x32_bridge.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>$(SolutionDir)bin\x32\x32bridge.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<ProgramDatabaseFile>$(TargetDir)$(TargetName)_exe.pdb</ProgramDatabaseFile>
|
||||
<AdditionalManifestDependencies>
|
||||
</AdditionalManifestDependencies>
|
||||
|
@ -151,7 +151,7 @@
|
|||
<SubSystem>Windows</SubSystem>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<AdditionalDependencies>$(SolutionDir)bin\x64\x64_bridge.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>$(SolutionDir)bin\x64\x64bridge.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<ProgramDatabaseFile>$(TargetDir)$(TargetName)_exe.pdb</ProgramDatabaseFile>
|
||||
<AdditionalManifestDependencies>
|
||||
</AdditionalManifestDependencies>
|
||||
|
@ -169,7 +169,7 @@
|
|||
<SubSystem>Windows</SubSystem>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<AdditionalDependencies>$(SolutionDir)bin\x64\x64_bridge.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>$(SolutionDir)bin\x64\x64bridge.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<ProgramDatabaseFile>$(TargetDir)$(TargetName)_exe.pdb</ProgramDatabaseFile>
|
||||
<AdditionalManifestDependencies>
|
||||
</AdditionalManifestDependencies>
|
||||
|
|
|
@ -2,4 +2,4 @@
|
|||
rem Working directory: '%{sourceDir}'
|
||||
rem argument1: architecture 'x32' or 'x64'
|
||||
rem argument2: built binary directory '%{buildDir}\release' for example
|
||||
copy %2\%1_gui.dll ..\..\bin\%1\
|
||||
copy %2\%1gui.dll ..\..\bin\%1\
|
|
@ -2,8 +2,8 @@
|
|||
rem Working directory: '%{sourceDir}'
|
||||
rem argument1: architecture 'x32' or 'x64'
|
||||
set result=1
|
||||
copy ..\..\bin\%1\lib%1_bridge.a Src\Bridge\
|
||||
copy ..\..\bin\%1\lib%1bridge.a Src\Bridge\
|
||||
if %ERRORLEVEL%==0 set result=0
|
||||
copy ..\..\bin\%1\%1_bridge.lib Src\Bridge\
|
||||
copy ..\..\bin\%1\%1bridge.lib Src\Bridge\
|
||||
if %ERRORLEVEL%==0 set result=0
|
||||
exit %result%
|
|
@ -18,9 +18,9 @@ QMAKE_CFLAGS_RELEASE += -Zi
|
|||
QMAKE_LFLAGS_RELEASE += /DEBUG
|
||||
|
||||
!contains(QMAKE_HOST.arch, x86_64) {
|
||||
TARGET = x32_gui
|
||||
TARGET = x32gui
|
||||
} else {
|
||||
TARGET = x64_gui
|
||||
TARGET = x64gui
|
||||
}
|
||||
|
||||
DEFINES += BUILD_LIB
|
||||
|
@ -208,12 +208,12 @@ LIBS += -luser32
|
|||
!contains(QMAKE_HOST.arch, x86_64) {
|
||||
#message("x86 build")
|
||||
LIBS += -L"$$PWD/Src/ThirdPartyLibs/BeaEngine/" -lBeaEngine
|
||||
LIBS += -L"$$PWD/Src/Bridge/" -lx32_bridge
|
||||
LIBS += -L"$$PWD/Src/Bridge/" -lx32bridge
|
||||
## Windows x86 (32bit) specific build here
|
||||
} else {
|
||||
#message("x86_64 build")
|
||||
LIBS += -L"$$PWD/Src/ThirdPartyLibs/BeaEngine/" -lBeaEngine_64
|
||||
LIBS += -L"$$PWD/Src/Bridge/" -lx64_bridge
|
||||
LIBS += -L"$$PWD/Src/Bridge/" -lx64bridge
|
||||
## Windows x64 (64bit) specific build here
|
||||
}
|
||||
|
||||
|
|
|
@ -300,7 +300,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
|
|||
if(!GetPrivateProfileStringW(L"Launcher", L"x32dbg", L"", sz32Path, MAX_PATH, szIniPath))
|
||||
{
|
||||
wcscpy_s(sz32Path, szCurrentDir);
|
||||
PathAppendW(sz32Path, L"x32\\x32_dbg.exe");
|
||||
PathAppendW(sz32Path, L"x32\\x32dbg.exe");
|
||||
if(FileExists(sz32Path))
|
||||
{
|
||||
WritePrivateProfileStringW(L"Launcher", L"x32dbg", sz32Path, szIniPath);
|
||||
|
@ -318,7 +318,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
|
|||
if(!GetPrivateProfileStringW(L"Launcher", L"x64dbg", L"", sz64Path, MAX_PATH, szIniPath))
|
||||
{
|
||||
wcscpy_s(sz64Path, szCurrentDir);
|
||||
PathAppendW(sz64Path, L"x64\\x64_dbg.exe");
|
||||
PathAppendW(sz64Path, L"x64\\x64dbg.exe");
|
||||
if(FileExists(sz64Path))
|
||||
{
|
||||
WritePrivateProfileStringW(L"Launcher", L"x64dbg", sz64Path, szIniPath);
|
||||
|
@ -338,12 +338,12 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
|
|||
wchar_t** argv = CommandLineToArgvW(GetCommandLineW(), &argc);
|
||||
if(argc <= 1) //no arguments -> set configuration
|
||||
{
|
||||
if(!FileExists(sz32Path) && BrowseFileOpen(0, L"x32_dbg.exe\0x32_dbg.exe\0\0", 0, sz32Path, MAX_PATH, szCurrentDir))
|
||||
if(!FileExists(sz32Path) && BrowseFileOpen(0, L"x32dbg.exe\0x32dbg.exe\0\0", 0, sz32Path, MAX_PATH, szCurrentDir))
|
||||
{
|
||||
WritePrivateProfileStringW(L"Launcher", L"x32dbg", sz32Path, szIniPath);
|
||||
bDoneSomething = true;
|
||||
}
|
||||
if(!FileExists(sz64Path) && BrowseFileOpen(0, L"x64_dbg.exe\0x64_dbg.exe\0\0", 0, sz64Path, MAX_PATH, szCurrentDir))
|
||||
if(!FileExists(sz64Path) && BrowseFileOpen(0, L"x64dbg.exe\0x64dbg.exe\0\0", 0, sz64Path, MAX_PATH, szCurrentDir))
|
||||
{
|
||||
WritePrivateProfileStringW(L"Launcher", L"x64dbg", sz64Path, szIniPath);
|
||||
bDoneSomething = true;
|
||||
|
|
|
@ -48,14 +48,14 @@
|
|||
<LinkIncremental>false</LinkIncremental>
|
||||
<OutDir>$(SolutionDir)bin\</OutDir>
|
||||
<IntDir>$(Platform)\$(Configuration)\</IntDir>
|
||||
<TargetName>x96_dbg</TargetName>
|
||||
<TargetName>x96dbg</TargetName>
|
||||
<GenerateManifest>false</GenerateManifest>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
<OutDir>$(SolutionDir)bin\</OutDir>
|
||||
<IntDir>$(Platform)\$(Configuration)\</IntDir>
|
||||
<TargetName>x96_dbg</TargetName>
|
||||
<TargetName>x96dbg</TargetName>
|
||||
<GenerateManifest>false</GenerateManifest>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
|
|
Loading…
Reference in New Issue