diff options
| -rw-r--r-- | build/android/jni/Android.mk | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/client/game.cpp | 2 | ||||
| -rw-r--r-- | src/main.cpp | 2 | ||||
| -rw-r--r-- | src/util/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/util/quicktune.cpp (renamed from src/quicktune.cpp) | 0 | ||||
| -rw-r--r-- | src/util/quicktune.h (renamed from src/quicktune.h) | 0 | ||||
| -rw-r--r-- | src/util/quicktune_shortcutter.h (renamed from src/quicktune_shortcutter.h) | 0 | ||||
| -rw-r--r-- | util/travis/clang-format-whitelist.txt | 6 |
9 files changed, 8 insertions, 9 deletions
diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk index 17b2606ce..22e1f8a08 100644 --- a/build/android/jni/Android.mk +++ b/build/android/jni/Android.mk @@ -241,7 +241,6 @@ LOCAL_SRC_FILES := \ jni/src/porting_android.cpp \ jni/src/porting.cpp \ jni/src/profiler.cpp \ - jni/src/quicktune.cpp \ jni/src/raycast.cpp \ jni/src/reflowscan.cpp \ jni/src/remoteplayer.cpp \ @@ -290,6 +289,7 @@ LOCAL_SRC_FILES := \ jni/src/util/ieee_float.cpp \ jni/src/util/numeric.cpp \ jni/src/util/pointedthing.cpp \ + jni/src/util/quicktune.cpp \ jni/src/util/serialize.cpp \ jni/src/util/sha1.cpp \ jni/src/util/srp.cpp \ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ebf5b2871..70a5ab3c8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -406,7 +406,6 @@ set(common_SRCS player.cpp porting.cpp profiler.cpp - quicktune.cpp raycast.cpp reflowscan.cpp remoteplayer.cpp @@ -739,7 +738,7 @@ if(WIN32) if(VCPKG_APPLOCAL_DEPS) # Collect the dll's from the output path install(DIRECTORY ${EXECUTABLE_OUTPUT_PATH}/Release/ - DESTINATION ${BINDIR} + DESTINATION ${BINDIR} CONFIGURATIONS Release FILES_MATCHING PATTERN "*.dll") install(DIRECTORY ${EXECUTABLE_OUTPUT_PATH}/Debug/ diff --git a/src/client/game.cpp b/src/client/game.cpp index fb2a81973..028d2d3bd 100644 --- a/src/client/game.cpp +++ b/src/client/game.cpp @@ -55,7 +55,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "particles.h" #include "porting.h" #include "profiler.h" -#include "quicktune_shortcutter.h" #include "raycast.h" #include "server.h" #include "settings.h" @@ -65,6 +64,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "util/basic_macros.h" #include "util/directiontables.h" #include "util/pointedthing.h" +#include "util/quicktune_shortcutter.h" #include "irrlicht_changes/static_text.h" #include "version.h" #include "script/scripting_client.h" diff --git a/src/main.cpp b/src/main.cpp index 6323fa50e..4629f92ce 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -29,7 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "defaultsettings.h" #include "gettext.h" #include "log.h" -#include "quicktune.h" +#include "util/quicktune.h" #include "httpfetch.h" #include "gameparams.h" #include "database/database.h" diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt index bf208693b..199d3aeaa 100644 --- a/src/util/CMakeLists.txt +++ b/src/util/CMakeLists.txt @@ -7,6 +7,7 @@ set(UTIL_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/ieee_float.cpp ${CMAKE_CURRENT_SOURCE_DIR}/numeric.cpp ${CMAKE_CURRENT_SOURCE_DIR}/pointedthing.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/quicktune.cpp ${CMAKE_CURRENT_SOURCE_DIR}/serialize.cpp ${CMAKE_CURRENT_SOURCE_DIR}/sha1.cpp ${CMAKE_CURRENT_SOURCE_DIR}/sha256.c @@ -14,4 +15,3 @@ set(UTIL_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/srp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/timetaker.cpp PARENT_SCOPE) - diff --git a/src/quicktune.cpp b/src/util/quicktune.cpp index 37d4933de..37d4933de 100644 --- a/src/quicktune.cpp +++ b/src/util/quicktune.cpp diff --git a/src/quicktune.h b/src/util/quicktune.h index 1943d19c2..1943d19c2 100644 --- a/src/quicktune.h +++ b/src/util/quicktune.h diff --git a/src/quicktune_shortcutter.h b/src/util/quicktune_shortcutter.h index 70a7b70b3..70a7b70b3 100644 --- a/src/quicktune_shortcutter.h +++ b/src/util/quicktune_shortcutter.h diff --git a/util/travis/clang-format-whitelist.txt b/util/travis/clang-format-whitelist.txt index f9cf150ed..0b36dcd57 100644 --- a/util/travis/clang-format-whitelist.txt +++ b/util/travis/clang-format-whitelist.txt @@ -296,9 +296,6 @@ src/porting_android.h src/porting.cpp src/porting.h src/profiler.h -src/quicktune.cpp -src/quicktune.h -src/quicktune_shortcutter.h src/raycast.cpp src/raycast.h src/reflowscan.cpp @@ -464,6 +461,9 @@ src/util/numeric.h src/util/pointedthing.cpp src/util/pointedthing.h src/util/pointer.h +src/util/quicktune.h +src/util/quicktune_shortcutter.h +src/util/quicktune.cpp src/util/serialize.cpp src/util/serialize.h src/util/sha1.cpp |