mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-29 13:04:58 +00:00
* force the tex2lyx Font class everywhere in tex2lyx. Without this in
TextClass.cpp the tex2lyx Font class was used, but elsewhere the LyX one. Hence, because of different binary sizes strange segfaults happened because the inline methods of TextClass used a different binary layout than the non-inline methods. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18488 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
bea2e90c93
commit
195bd0b0b1
@ -44,11 +44,11 @@ set(tex2lyx_headers
|
|||||||
include_directories(BEFORE ${TOP_SRC_DIR}/src/tex2lyx)
|
include_directories(BEFORE ${TOP_SRC_DIR}/src/tex2lyx)
|
||||||
|
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
SET_SOURCE_FILES_PROPERTIES(${TOP_SRC_DIR}/src/Layout.cpp ${TOP_SRC_DIR}/src/TextClass.cpp
|
SET_SOURCE_FILES_PROPERTIES(${tex2lyx_sources} ${LINKED_FILES}
|
||||||
PROPERTIES COMPILE_FLAGS
|
PROPERTIES COMPILE_FLAGS
|
||||||
"/DFONT_H /FI${TOP_SRC_DIR}/src/tex2lyx/Font.h /FI${TOP_SRC_DIR}/src/tex2lyx/Spacing.h")
|
"/DFONT_H /FI${TOP_SRC_DIR}/src/tex2lyx/Font.h /FI${TOP_SRC_DIR}/src/tex2lyx/Spacing.h")
|
||||||
else(MSVC)
|
else(MSVC)
|
||||||
SET_SOURCE_FILES_PROPERTIES(${TOP_SRC_DIR}/src/Layout.cpp ${TOP_SRC_DIR}/src/TextClass.cpp
|
SET_SOURCE_FILES_PROPERTIES(${tex2lyx_sources} ${LINKED_FILES}
|
||||||
PROPERTIES COMPILE_FLAGS
|
PROPERTIES COMPILE_FLAGS
|
||||||
"-DFONT_H -include ${TOP_SRC_DIR}/src/tex2lyx/Font.h -include ${TOP_SRC_DIR}/src/tex2lyx/Spacing.h")
|
"-DFONT_H -include ${TOP_SRC_DIR}/src/tex2lyx/Font.h -include ${TOP_SRC_DIR}/src/tex2lyx/Spacing.h")
|
||||||
endif(MSVC)
|
endif(MSVC)
|
||||||
|
Loading…
Reference in New Issue
Block a user