diff --git a/SConstruct b/SConstruct
index 19a9fce5..bc222ad4 100644
--- a/SConstruct
+++ b/SConstruct
@@ -84,7 +84,7 @@ print('C++ compiler:', cxx)
 
 env.VariantDir('#build/obj', 'src')
 env.VariantDir('#build/obj/test', 'test')
-env.VariantDir('#build/obj/test/deps', 'deps')
+env.VariantDir('#build/obj/deps', 'deps')
 
 if not env['release']:
 	if platform in ['posix', 'darwin']:
@@ -411,6 +411,12 @@ if not env.GetOption('clean'):
 
 	env.Append(CPPPATH=[path.join(os.getcwd(), 'deps/cppcodec')])
 
+	# Make sure fmtlib is cloned
+	if not path.exists('deps/fmtlib/fmt/format.h'):
+		subprocess.call(["git", "submodule", "update", "--init", "deps/fmtlib"])
+
+	env.Append(CPPPATH=[path.join(os.getcwd(), 'deps/fmtlib/include')])
+
 	# On Linux, build TGUI from the subtree if necessary
 	if platform == 'posix':
 		def check_tgui(conf, second_attempt=False):
diff --git a/src/game/SConscript b/src/game/SConscript
index 3b2e14e5..dc3c8b9a 100644
--- a/src/game/SConscript
+++ b/src/game/SConscript
@@ -24,6 +24,8 @@ game_sources = Split("""
 	../pcedit/pc.editors.cpp
 	../fileio/fileio_party.cpp
 	../view_dialogs.cpp
+	../deps/fmtlib/src/format.cc
+	../deps/fmtlib/src/os.cc
 """)
 
 if str(platform) == "darwin":
diff --git a/src/pcedit/SConscript b/src/pcedit/SConscript
index 38afdb9b..d5af21dc 100644
--- a/src/pcedit/SConscript
+++ b/src/pcedit/SConscript
@@ -8,6 +8,8 @@ pced_sources = Split("""
 	pc.graphics.cpp
 	pc.main.cpp
 	../fileio/fileio_party.cpp
+	../deps/fmtlib/src/format.cc
+	../deps/fmtlib/src/os.cc
 """)
 
 if str(platform) == "darwin":
diff --git a/src/scenedit/SConscript b/src/scenedit/SConscript
index aa1dcfdf..8a767bec 100644
--- a/src/scenedit/SConscript
+++ b/src/scenedit/SConscript
@@ -16,6 +16,8 @@ scened_sources = Split("""
 	../view_dialogs.cpp
 	../fileio/fileio_party.cpp
 	../damage.cpp
+	../deps/fmtlib/src/format.cc
+	../deps/fmtlib/src/os.cc
 """)
 
 if str(platform) == "darwin":
diff --git a/test/SConscript b/test/SConscript
index 04767ee5..bdb56ceb 100644
--- a/test/SConscript
+++ b/test/SConscript
@@ -5,10 +5,12 @@ Import("env platform party_classes common_sources")
 arch_short = '64' if (env['bits'] == '64') else '86'
 
 # Add path to scons
-env.Append(CPPPATH=['./deps/Catch2/single_include/catch2'])
+env.Append(CPPPATH=['../deps/Catch2/single_include/catch2'])
 
 test_sources = Glob("""*.cpp""") + Split("""
 	#build/obj/scenedit/scen.fileio.cpp
+	../deps/fmtlib/src/format.cc
+	../deps/fmtlib/src/os.cc
 """)
 
 debug_symbols = None