Skip to content

Y
ygopro
Commit 7ab7abc4 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' into another

parents 0b6b7811 e17b1a56
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 7 deletions
.travis.yml
View file @ 7ab7abc4
...@@ -61,7 +61,7 @@ script: ...@@ -61,7 +61,7 @@ script:
- cd build - cd build
- make config=release ygopro -j4 - make config=release ygopro -j4
- cd .. - cd ..
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then mv -f bin/debug/ygopro ./; strip ygopro; - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then mv -f bin/release/ygopro ./; strip ygopro;
fi fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
mkdir -p ygopro.app/Contents/MacOS; mkdir -p ygopro.app/Contents/MacOS;
......
cards.cdb
View file @ 7ab7abc4
No preview for this file type
gframe/gframe.cpp
View file @ 7ab7abc4
...@@ -35,11 +35,15 @@ int main(int argc, char* argv[]) { ...@@ -35,11 +35,15 @@ int main(int argc, char* argv[]) {
#endif //__APPLE__ #endif //__APPLE__
#ifdef _WIN32 #ifdef _WIN32
#ifndef _DEBUG #ifndef _DEBUG
wchar_t exepath[MAX_PATH]; char* pstrext;
GetModuleFileNameW(NULL, exepath, MAX_PATH); if(argc == 2 && (pstrext = strrchr(argv[1], '.'))
wchar_t* p = wcsrchr(exepath, '\\'); && (!mystrncasecmp(pstrext, ".ydk", 4) || !mystrncasecmp(pstrext, ".yrp", 4))) {
*p = '\0'; wchar_t exepath[MAX_PATH];
SetCurrentDirectoryW(exepath); GetModuleFileNameW(NULL, exepath, MAX_PATH);
wchar_t* p = wcsrchr(exepath, '\\');
*p = '\0';
SetCurrentDirectoryW(exepath);
}
#endif //_DEBUG #endif //_DEBUG
#endif //_WIN32 #endif //_WIN32
#ifdef _WIN32 #ifdef _WIN32
......
script @ 47adef36
Subproject commit 44a8b72a59752a4d16ac2a658b4e9169b3c6b1eb Subproject commit 47adef367f7160dfbee07c236c2ce9a051733ff4
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