Commit 61ee15fb authored by mercury233's avatar mercury233

Merge branch 'server-link' into server

parents 5695b4cd e14a6a81
...@@ -2,6 +2,9 @@ ...@@ -2,6 +2,9 @@
#include "game.h" #include "game.h"
#include "data_manager.h" #include "data_manager.h"
#include <event2/thread.h> #include <event2/thread.h>
#ifdef __APPLE__
#import <CoreFoundation/CoreFoundation.h>
#endif
int enable_log = 0; int enable_log = 0;
#ifndef YGOPRO_SERVER_MODE #ifndef YGOPRO_SERVER_MODE
...@@ -38,6 +41,15 @@ int main(int argc, char* argv[]) { ...@@ -38,6 +41,15 @@ int main(int argc, char* argv[]) {
#ifndef _WIN32 #ifndef _WIN32
setlocale(LC_CTYPE, "UTF-8"); setlocale(LC_CTYPE, "UTF-8");
#endif #endif
#ifdef __APPLE__
CFURLRef bundle_url = CFBundleCopyBundleURL(CFBundleGetMainBundle());
CFURLRef bundle_base_url = CFURLCreateCopyDeletingLastPathComponent(NULL, bundle_url);
CFRelease(bundle_url);
CFStringRef path = CFURLCopyFileSystemPath(bundle_base_url, kCFURLPOSIXPathStyle);
CFRelease(bundle_base_url);
chdir(CFStringGetCStringPtr(path, kCFStringEncodingUTF8));
CFRelease(path);
#endif //__APPLE__
#ifdef _WIN32 #ifdef _WIN32
#ifndef _DEBUG #ifndef _DEBUG
wchar_t exepath[MAX_PATH]; wchar_t exepath[MAX_PATH];
......
This diff is collapsed.
Subproject commit dfac0fbd59976a0612da49cc1b960290004df2ed Subproject commit fe0abffda1317f03b9f6cd7e3f9ee490e827d764
Subproject commit 5f67c18822546bb7182c9c5a6567d42ecfe7592d Subproject commit a880e460e6b641590b9657c0769735b2267a9029
...@@ -848,3 +848,4 @@ ...@@ -848,3 +848,4 @@
!setname 0x107 方程式运动员 F.A. !setname 0x107 方程式运动员 F.A.
!setname 0x108 魔弹 魔弾 !setname 0x108 魔弹 魔弾
!setname 0x109 天气 天気 !setname 0x109 天气 天気
!setname 0x10a 珀耳修斯 パーシアス
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment