Fix non cmake build paths for updated nlohmann_json version.

raduprv · Jul 31, 2024 · d38703c · d38703c
1 parent 9142f08
commit d38703c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Android.mk b/Android.mk
@@ -31,7 +31,7 @@ $(LOCAL_PATH)/$(GL4ES_PATH)/include/ \
 $(LOCAL_PATH)/$(GLU_PATH)/include/ \
 $(LOCAL_PATH)/$(ZLIB_PATH)/ \
 $(LOCAL_PATH)/$(MYGLOB_PATH)/include/ \
-$(LOCAL_PATH)/nlohmann_json/single_include/ \
+$(LOCAL_PATH)/nlohmann_json/include/ \
 $(LOCAL_PATH)/$(OPENSSL_PATH)/include/
 
 LOCAL_CPPFLAGS := \

diff --git a/Makefile.linux b/Makefile.linux
@@ -2,7 +2,7 @@
 
 -include make.conf
 
-JSON_FILES_CFLAGS = -I nlohmann_json/single_include/
+JSON_FILES_CFLAGS = -I nlohmann_json/include/
 ADDRSANITISER_CFLAGS=-fsanitize=address
 
 ADDRSANITISER_LIBS=-fsanitize=address

diff --git a/macosx/Eternal Lands.xcodeproj/project.pbxproj b/macosx/Eternal Lands.xcodeproj/project.pbxproj
@@ -1809,7 +1809,7 @@
 					"$(USER_LIBRARY_DIR)/Frameworks/SDL2_net.framework/Headers",
 					"$(USER_LIBRARY_DIR)/Frameworks/SDL2_ttf.framework/Headers",
 					"$(USER_LIBRARY_DIR)/Frameworks/SDL2_image.framework/Headers",
-					"$(SRCROOT)/../nlohmann_json/single_include/",
+					"$(SRCROOT)/../nlohmann_json/include/",
 					"$(SRCROOT)/include/",
 				);
 				MARKETING_VERSION = 1.9.6p1;
@@ -1871,7 +1871,7 @@
 					"$(USER_LIBRARY_DIR)/Frameworks/SDL2_net.framework/Headers",
 					"$(USER_LIBRARY_DIR)/Frameworks/SDL2_ttf.framework/Headers",
 					"$(USER_LIBRARY_DIR)/Frameworks/SDL2_image.framework/Headers",
-					"$(SRCROOT)/../nlohmann_json/single_include/",
+					"$(SRCROOT)/../nlohmann_json/include/",
 					"$(SRCROOT)/include/",
 				);
 				MARKETING_VERSION = 1.9.6p1;