From 5522ac0f2d7cde0633480239d76d0257f584f6dc Mon Sep 17 00:00:00 2001 From: terminx Date: Mon, 23 Apr 2018 06:35:25 +0000 Subject: [PATCH] Rename int64.h to fix16_int64.h git-svn-id: https://svn.eduke32.com/eduke32@6848 1a8010ca-5511-0410-912e-c29ae57300e0 --- platform/Windows/eduke32.vcxproj | 1 + platform/Windows/eduke32.vcxproj.filters | 3 +++ source/build/Dependencies.mak | 2 +- source/build/include/{int64.h => fix16_int64.h} | 0 source/build/src/fix16.c | 2 +- 5 files changed, 6 insertions(+), 2 deletions(-) rename source/build/include/{int64.h => fix16_int64.h} (100%) diff --git a/platform/Windows/eduke32.vcxproj b/platform/Windows/eduke32.vcxproj index 79d8144d7..622454ea8 100644 --- a/platform/Windows/eduke32.vcxproj +++ b/platform/Windows/eduke32.vcxproj @@ -105,6 +105,7 @@ + diff --git a/platform/Windows/eduke32.vcxproj.filters b/platform/Windows/eduke32.vcxproj.filters index 00519fb4d..af45d9a35 100644 --- a/platform/Windows/eduke32.vcxproj.filters +++ b/platform/Windows/eduke32.vcxproj.filters @@ -570,6 +570,9 @@ build\headers + + build\headers + diff --git a/source/build/Dependencies.mak b/source/build/Dependencies.mak index 65397e598..dbcc183fe 100644 --- a/source/build/Dependencies.mak +++ b/source/build/Dependencies.mak @@ -46,7 +46,7 @@ $(ENGINE_OBJ)/winbits.$o: $(ENGINE_SRC)/winbits.cpp $(ENGINE_INC)/winbits.h $(ENGINE_OBJ)/xxhash.$o: $(ENGINE_SRC)/xxhash.c $(ENGINE_INC)/xxhash.h $(ENGINE_OBJ)/pngwrite.$o: $(ENGINE_SRC)/pngwrite.cpp $(ENGINE_INC)/pngwrite.h $(ENGINE_OBJ)/miniz.$o: $(ENGINE_SRC)/miniz.c $(ENGINE_INC)/miniz.h -$(ENGINE_OBJ)/fix16.$o: $(ENGINE_SRC)/fix16.c $(ENGINE_INC)/fix16.h +$(ENGINE_OBJ)/fix16.$o: $(ENGINE_SRC)/fix16.c $(ENGINE_INC)/fix16.h $(ENGINE_INC)/fix16_int64.h $(ENGINE_OBJ)/fix16_str.$o: $(ENGINE_SRC)/fix16_str.c $(ENGINE_INC)/fix16.h $(ENGINE_OBJ)/lunatic.$o: $(ENGINE_SRC)/lunatic.cpp $(ENGINE_INC)/lunatic.h $(ENGINE_INC)/cache1d.h $(ENGINE_INC)/osd.h diff --git a/source/build/include/int64.h b/source/build/include/fix16_int64.h similarity index 100% rename from source/build/include/int64.h rename to source/build/include/fix16_int64.h diff --git a/source/build/src/fix16.c b/source/build/src/fix16.c index 7c73499d6..f0bef3c70 100644 --- a/source/build/src/fix16.c +++ b/source/build/src/fix16.c @@ -1,5 +1,5 @@ #include "fix16.h" -#include "int64.h" +#include "fix16_int64.h" /* Subtraction and addition with overflow detection. * The versions without overflow detection are inlined in the header.