From 7ffab529b8f846278502fc637fb4035512eda967 Mon Sep 17 00:00:00 2001 From: Luke Street Date: Mon, 18 Jul 2022 01:37:40 -0400 Subject: [PATCH] Link CSWDataDolphin.cpp Former-commit-id: cb48c96516145e2ea449f5c248576712263a769c --- obj_files.mk | 2 +- src/Kyoto/Basics/CSWDataDolphin.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/obj_files.mk b/obj_files.mk index 4f1da61c..94a38bf2 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -432,7 +432,7 @@ KYOTO :=\ $(BUILD_DIR)/asm/Kyoto/Basics/CBasicsDolphin.o\ $(BUILD_DIR)/asm/Kyoto/Basics/CCallStackDolphin.o\ $(BUILD_DIR)/asm/Kyoto/Basics/COsContextDolphin.o\ - $(BUILD_DIR)/asm/Kyoto/Basics/CSWDataDolphin.o\ + $(BUILD_DIR)/src/Kyoto/Basics/CSWDataDolphin.o\ $(BUILD_DIR)/asm/Kyoto/Basics/RAssertDolphin.o\ $(BUILD_DIR)/asm/Kyoto/Animation/CAnimation.o\ $(BUILD_DIR)/asm/Kyoto/Animation/CAnimationManager.o\ diff --git a/src/Kyoto/Basics/CSWDataDolphin.cpp b/src/Kyoto/Basics/CSWDataDolphin.cpp index a246ec45..1fc8cdf8 100644 --- a/src/Kyoto/Basics/CSWDataDolphin.cpp +++ b/src/Kyoto/Basics/CSWDataDolphin.cpp @@ -4,7 +4,7 @@ bool CStopwatch::CSWData::Initialize() { x0_timerFreq = OS_TIMER_CLOCK; - x8_timerFreqO1M = x0_timerFreq / 1000000ull; + x8_timerFreqO1M = x0_timerFreq / 1000000ll; x10_timerPeriod = 1.f / static_cast(x0_timerFreq); return true; }