diff --git a/.gitignore b/.gitignore index 6ba16c87..c3dbd72f 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,7 @@ make.sh gitpush_serverstuff_stable pokerth_server .vscode -,qmake.stash +.qmake.stash pokerth.ap* *.DS_STORE .gitignore.save diff --git a/.qmake.stash b/.qmake.stash deleted file mode 100644 index 1ae0d1b8..00000000 --- a/.qmake.stash +++ /dev/null @@ -1,44 +0,0 @@ -QMAKE_MAC_SDK.macosx.Path = /Library/Developer/CommandLineTools/SDKs/MacOSX10.14.sdk -QMAKE_MAC_SDK.macosx.SDKVersion = 10.14.6 -QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_CC = /Library/Developer/CommandLineTools/usr/bin/clang -QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_CXX = /Library/Developer/CommandLineTools/usr/bin/clang++ -QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_FIX_RPATH = \ - /Library/Developer/CommandLineTools/usr/bin/install_name_tool \ - -id -QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_AR = \ - /Library/Developer/CommandLineTools/usr/bin/ar \ - cq -QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_RANLIB = \ - /Library/Developer/CommandLineTools/usr/bin/ranlib \ - -s -QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_LINK = /Library/Developer/CommandLineTools/usr/bin/clang++ -QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_LINK_SHLIB = /Library/Developer/CommandLineTools/usr/bin/clang++ -QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_LINK_C = /Library/Developer/CommandLineTools/usr/bin/clang -QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_LINK_C_SHLIB = /Library/Developer/CommandLineTools/usr/bin/clang -QMAKE_CXX.QT_COMPILER_STDCXX = 199711L -QMAKE_CXX.QMAKE_APPLE_CC = 6000 -QMAKE_CXX.QMAKE_APPLE_CLANG_MAJOR_VERSION = 10 -QMAKE_CXX.QMAKE_APPLE_CLANG_MINOR_VERSION = 0 -QMAKE_CXX.QMAKE_APPLE_CLANG_PATCH_VERSION = 1 -QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 4 -QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 2 -QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 1 -QMAKE_CXX.COMPILER_MACROS = \ - QT_COMPILER_STDCXX \ - QMAKE_APPLE_CC \ - QMAKE_APPLE_CLANG_MAJOR_VERSION \ - QMAKE_APPLE_CLANG_MINOR_VERSION \ - QMAKE_APPLE_CLANG_PATCH_VERSION \ - QMAKE_GCC_MAJOR_VERSION \ - QMAKE_GCC_MINOR_VERSION \ - QMAKE_GCC_PATCH_VERSION -QMAKE_CXX.INCDIRS = \ - /Library/Developer/CommandLineTools/usr/include/c++/v1 \ - /Library/Developer/CommandLineTools/usr/lib/clang/10.0.1/include \ - /Library/Developer/CommandLineTools/usr/include \ - /Library/Developer/CommandLineTools/SDKs/MacOSX10.14.sdk/usr/include -QMAKE_CXX.LIBDIRS = /Library/Developer/CommandLineTools/SDKs/MacOSX10.14.sdk/usr/lib -QMAKE_XCODE_DEVELOPER_PATH = /Library/Developer/CommandLineTools -QMAKE_MAC_SDK.macosx.PlatformPath = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform -QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_ACTOOL = /Applications/Xcode.app/Contents/Developer/usr/bin/actool -QMAKE_XCODE_VERSION = 10.3