games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Code Issues Releases Activity

move extern "C" to header

Browse Source
This commit is contained in:
Andrey Filipenkov 2021-03-20 17:05:32 +03:00
parent 01c17d856f
commit 2354023731
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/CIOSUtils.h
View File

@ -7,6 +7,12 @@
* Full text of license available in license.txt file, in main folder * Full text of license available in license.txt file, in main folder
* *
*/ */
#pragma once
#ifdef __cplusplus
extern "C" {
#endif
#include <TargetConditionals.h> #include <TargetConditionals.h>
#ifdef __OBJC__ #ifdef __OBJC__
@ -30,3 +36,7 @@ extern const char *ios_bundlePath();
extern const char *ios_frameworksPath(); extern const char *ios_frameworksPath();
extern const char *ios_bundleIdentifier(); extern const char *ios_bundleIdentifier();
#ifdef __cplusplus
}
#endif

2
lib/VCMIDirs.cpp
View File

@ -375,9 +375,7 @@ bfs::path VCMIDirsApple::userConfigPath() const { return userDataPath() / "confi
std::string VCMIDirsApple::libraryName(const std::string& basename) const { return "lib" + basename + ".dylib"; } std::string VCMIDirsApple::libraryName(const std::string& basename) const { return "lib" + basename + ".dylib"; }
#ifdef VCMI_IOS #ifdef VCMI_IOS
extern "C" {
#import "CIOSUtils.h" #import "CIOSUtils.h"
}
class VCMIDirsIOS final : public VCMIDirsApple class VCMIDirsIOS final : public VCMIDirsApple
{ {

2
lib/logging/CLogger.cpp
View File

@ -31,8 +31,8 @@ namespace ELogLevel
} }
} }
#elif defined(VCMI_IOS) #elif defined(VCMI_IOS)
extern "C" {
#import "../CIOSUtils.h" #import "../CIOSUtils.h"
extern "C" {
#include <os/log.h> #include <os/log.h>
} }
#endif #endif

2
server/ios/main.mm
View File

@ -11,9 +11,7 @@
#include "../Global.h" #include "../Global.h"
#include "CVCMIServer.h" #include "CVCMIServer.h"
extern "C" {
#import "../lib/CIOSUtils.h" #import "../lib/CIOSUtils.h"
}
@interface ViewController : UIViewController @interface ViewController : UIViewController
@property (nonatomic, copy) NSArray<NSURL *> *dataDirsInDocuments; @property (nonatomic, copy) NSArray<NSURL *> *dataDirsInDocuments;