From a524692e4f5f40758ca13705c7ce0e14ce310406 Mon Sep 17 00:00:00 2001 From: Spoike Date: Sun, 6 Oct 2019 22:41:02 +0000 Subject: [PATCH] Fixes from ericw. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5563 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- CMakeLists.txt | 2 +- engine/common/com_mesh.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ad0ef7c4..09931847a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -903,9 +903,9 @@ ELSE() SET_TARGET_PROPERTIES(fteqccgui PROPERTIES COMPILE_DEFINITIONS "${FTE_LIB_DEFINES};${FTE_REVISON};${Qt5Widgets_COMPILE_DEFINITIONS}") SET_PROPERTY(TARGET fteqccgui PROPERTY POSITION_INDEPENDENT_CODE TRUE) TARGET_LINK_LIBRARIES(fteqccgui ${FTEQCC_LIBS} ${Qt5Widgets_LIBRARIES} ${QSCINTILLA_LIBRARY}) + SET(INSTALLTARGS ${INSTALLTARGS} fteqccgui) ELSE() MESSAGE(WARNING "qscintilla/qt5widgets library not detected, no fteqccgui for you") - SET(INSTALLTARGS ${INSTALLTARGS} fteqccgui) ENDIF() ENDIF() ENDIF() diff --git a/engine/common/com_mesh.c b/engine/common/com_mesh.c index 09c55cba9..8188e2efd 100644 --- a/engine/common/com_mesh.c +++ b/engine/common/com_mesh.c @@ -7700,7 +7700,7 @@ static void IQM_ImportArrayF(const qbyte *fte_restrict base, const struct iqmver case IQM_HALF: #ifdef __F16C__ { //x86 intrinsics - const unsigned short *in = (const qbyte*)(base+offset); + const unsigned short *in = (const unsigned short*)(base+offset); for (i = 0; i < count; i++) { for (j = 0; j < e && j < sz; j++)