mirror of
				https://github.com/lov3b/Pong.git
				synced 2025-11-03 23:00:19 +01:00 
			
		
		
		
	Merge branch 'master' of github.com:lov3b/Pong
This commit is contained in:
		@@ -1,6 +1,6 @@
 | 
				
			|||||||
// SPDX-License-Identifier: BSD-2-Clause
 | 
					// SPDX-License-Identifier: BSD-2-Clause
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#if defined(__LINUX__)
 | 
					#ifdef __linux__
 | 
				
			||||||
#include <filesystem>
 | 
					#include <filesystem>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const char *getLinuxFilePath() {
 | 
					const char *getLinuxFilePath() {
 | 
				
			||||||
@@ -21,7 +21,7 @@ const char *getLinuxFilePath() {
 | 
				
			|||||||
const char *getDefaultFontPath() {
 | 
					const char *getDefaultFontPath() {
 | 
				
			||||||
#if defined(_WIN32) || defined(_WIN64)
 | 
					#if defined(_WIN32) || defined(_WIN64)
 | 
				
			||||||
    return R"(C:\Windows\Fonts\Arial.ttf)";
 | 
					    return R"(C:\Windows\Fonts\Arial.ttf)";
 | 
				
			||||||
#elif defined(__linux__)
 | 
					#elifdef __linux__
 | 
				
			||||||
    return getLinuxFilePath();
 | 
					    return getLinuxFilePath();
 | 
				
			||||||
#elif defined(__APPLE__) || defined(__MACH__)
 | 
					#elif defined(__APPLE__) || defined(__MACH__)
 | 
				
			||||||
    return "/System/Library/Fonts/Supplemental/Arial.ttf";
 | 
					    return "/System/Library/Fonts/Supplemental/Arial.ttf";
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user