Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2024-11-12 02:00:52 +01:00
Code Releases Wiki Activity

fix: Some merge issues

Browse Source
This commit is contained in:
WerWolv 2024-09-15 15:55:21 +02:00
parent 96a588bd86
commit b3a0ebe7b6
3 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -37,8 +37,8 @@ include("${IMHEX_BASE_FOLDER}/cmake/build_helpers.cmake")
# Setup project # Setup project
loadVersion(IMHEX_VERSION IMHEX_VERSION_PLAIN) loadVersion(IMHEX_VERSION IMHEX_VERSION_PLAIN)
setVariableInParent(IMHEX_VERSION ${IMHEX_VERSION}) setVariableInParent(IMHEX_VERSION ${IMHEX_VERSION})
configureCMake()
configureCMake()
project(imhex project(imhex
LANGUAGES C CXX LANGUAGES C CXX
VERSION ${IMHEX_VERSION_PLAIN} VERSION ${IMHEX_VERSION_PLAIN}

3
cmake/build_helpers.cmake
View File

@ -307,9 +307,6 @@ endfunction()
macro(configureCMake) macro(configureCMake)
message(STATUS "Configuring ImHex v${IMHEX_VERSION}") message(STATUS "Configuring ImHex v${IMHEX_VERSION}")
# Enable C and C++ languages
enable_language(C CXX)
set(CMAKE_POSITION_INDEPENDENT_CODE ON CACHE BOOL "Enable position independent code for all targets" FORCE) set(CMAKE_POSITION_INDEPENDENT_CODE ON CACHE BOOL "Enable position independent code for all targets" FORCE)
# Configure use of recommended build tools # Configure use of recommended build tools

8
lib/third_party/imgui/ColorTextEditor/source/TextEditor.cpp vendored
View File

@ -392,14 +392,6 @@ TextEditor::Coordinates TextEditor::FindWordEnd(const Coordinates &aFrom) const
while (cindex < (line.size()) && !isWordChar(line[cindex].mChar)) while (cindex < (line.size()) && !isWordChar(line[cindex].mChar))
++cindex; ++cindex;
if (prevspace != !!isspace(c)) {
if (isspace(c))
while (cindex < (int)line.size() && isspace(line[cindex].mChar))
++cindex;
break;
}
cindex += d;
if (line[cindex-1].mChar == '\"') if (line[cindex-1].mChar == '\"')
--cindex; --cindex;
return Coordinates(aFrom.mLine, GetCharacterColumn(aFrom.mLine, cindex)); return Coordinates(aFrom.mLine, GetCharacterColumn(aFrom.mLine, cindex));