From 0df074db057beeb5454be474ce14a49b6936c6b2 Mon Sep 17 00:00:00 2001
From: CozmoP <25121396+CozmoP@users.noreply.github.com>
Date: Tue, 15 Jan 2019 18:58:31 +0100
Subject: [PATCH 1/2] fix MSVC 2017 Qt builds
---
pkg/msvc/msvc-2017/RetroArch-msvc2017.vcxproj | 513 ++++++++++++++----
1 file changed, 416 insertions(+), 97 deletions(-)
diff --git a/pkg/msvc/msvc-2017/RetroArch-msvc2017.vcxproj b/pkg/msvc/msvc-2017/RetroArch-msvc2017.vcxproj
index f228bad8bf..702cbaa14b 100644
--- a/pkg/msvc/msvc-2017/RetroArch-msvc2017.vcxproj
+++ b/pkg/msvc/msvc-2017/RetroArch-msvc2017.vcxproj
@@ -281,7 +281,7 @@
true
- $(IncludePath);$(DXSDK_DIR)Include;$(QtDirectory)\msvc2017_64\include\QtCore;$(QtDirectory)\msvc2017_64\include\QtWidgets;$(QtDirectory)\msvc2017_64\include\QtGui;$(QtDirectory)\msvc2017_64\include\
+ $(IncludePath);$(DXSDK_DIR)Include;$(QtDirectory)\msvc2017_64\include\QtCore;$(QtDirectory)\msvc2017_64\include\QtWidgets;$(QtDirectory)\msvc2017_64\include\QtGui;$(QtDirectory)\msvc2017_64\include\QtNetwork;$(QtDirectory)\msvc2017_64\include\QtConcurrent;$(QtDirectory)\msvc2017_64\include\
$(DXSDK_DIR)Lib\x64;$(QtDirectory)\msvc2017_64\lib;$(LibraryPath)
AllRules.ruleset
@@ -290,7 +290,7 @@
true
- $(CG_INC_PATH);$(IncludePath);$(DXSDK_DIR)Include;$(QtDirectory)\msvc2017_64\include\QtCore;$(QtDirectory)\msvc2017_64\include\QtWidgets;$(QtDirectory)\msvc2017_64\include\QtGui;$(QtDirectory)\msvc2017_64\include\
+ $(CG_INC_PATH);$(IncludePath);$(DXSDK_DIR)Include;$(QtDirectory)\msvc2017_64\include\QtCore;$(QtDirectory)\msvc2017_64\include\QtWidgets;$(QtDirectory)\msvc2017_64\include\QtGui;$(QtDirectory)\msvc2017_64\include\QtNetwork;$(QtDirectory)\msvc2017_64\include\QtConcurrent;$(QtDirectory)\msvc2017_64\include\
$(DXSDK_DIR)Lib\x64;$(CG_LIB64_PATH);$(QtDirectory)\msvc2017_64\lib;$(LibraryPath)
AllRules.ruleset
@@ -349,7 +349,7 @@
false
- $(IncludePath);$(DXSDK_DIR)Include;$(QtDirectory)\msvc2017_64\include\QtCore;$(QtDirectory)\msvc2017_64\include\QtWidgets;$(QtDirectory)\msvc2017_64\include\QtGui;$(QtDirectory)\msvc2017_64\include\
+ $(IncludePath);$(DXSDK_DIR)Include;$(QtDirectory)\msvc2017_64\include\QtCore;$(QtDirectory)\msvc2017_64\include\QtWidgets;$(QtDirectory)\msvc2017_64\include\QtGui;$(QtDirectory)\msvc2017_64\include\QtNetwork;$(QtDirectory)\msvc2017_64\include\QtConcurrent;$(QtDirectory)\msvc2017_64\include\
$(DXSDK_DIR)Lib\x64;$(QtDirectory)\msvc2017_64\lib;$(LibraryPath)
AllRules.ruleset
@@ -358,7 +358,7 @@
false
- $(CG_INC_PATH);$(IncludePath);$(DXSDK_DIR)Include;$(QtDirectory)\msvc2017_64\include\QtCore;$(QtDirectory)\msvc2017_64\include\QtWidgets;$(QtDirectory)\msvc2017_64\include\QtGui;$(QtDirectory)\msvc2017_64\include\
+ $(CG_INC_PATH);$(IncludePath);$(DXSDK_DIR)Include;$(QtDirectory)\msvc2017_64\include\QtCore;$(QtDirectory)\msvc2017_64\include\QtWidgets;$(QtDirectory)\msvc2017_64\include\QtGui;$(QtDirectory)\msvc2017_64\include\QtNetwork;$(QtDirectory)\msvc2017_64\include\QtConcurrent;$(QtDirectory)\msvc2017_64\include\
$(DXSDK_DIR)Lib\x64;$(CG_LIB64_PATH);$(QtDirectory)\msvc2017_64\lib;$(LibraryPath)
AllRules.ruleset
@@ -423,7 +423,7 @@
Console
true
- msimg32.lib;winmm.lib;Dinput8.lib;dxguid.lib;Iphlpapi.lib;qtmain.lib;Qt5Widgets.lib;Qt5Gui.lib;Qt5Core.lib;%(AdditionalDependencies)
+ msimg32.lib;winmm.lib;Dinput8.lib;dxguid.lib;Iphlpapi.lib;qtmain.lib;Qt5Widgets.lib;Qt5Gui.lib;Qt5Core.lib;Qt5Network.lib;Qt5Concurrent.lib;%(AdditionalDependencies)
$(CG_LIB_PATH)
@@ -444,7 +444,7 @@
Console
true
- msimg32.lib;winmm.lib;Dinput8.lib;dxguid.lib;Iphlpapi.lib;qtmain.lib;Qt5Widgets.lib;Qt5Gui.lib;Qt5Core.lib;%(AdditionalDependencies)
+ msimg32.lib;winmm.lib;Dinput8.lib;dxguid.lib;Iphlpapi.lib;qtmain.lib;Qt5Widgets.lib;Qt5Gui.lib;Qt5Core.lib;Qt5Network.lib;Qt5Concurrent.lib;%(AdditionalDependencies)
$(CG_LIB_PATH)
@@ -506,7 +506,7 @@
Console
true
- msimg32.lib;winmm.lib;Dinput8.lib;dxguid.lib;Iphlpapi.lib;qtmain.lib;Qt5Widgets.lib;Qt5Gui.lib;Qt5Core.lib;%(AdditionalDependencies)
+ msimg32.lib;winmm.lib;Dinput8.lib;dxguid.lib;Iphlpapi.lib;qtmain.lib;Qt5Widgets.lib;Qt5Gui.lib;Qt5Core.lib;Qt5Network.lib;Qt5Concurrent.lib;%(AdditionalDependencies)
$(CG_LIB64_PATH)
@@ -527,7 +527,7 @@
Console
true
- msimg32.lib;winmm.lib;Dinput8.lib;dxguid.lib;Iphlpapi.lib;qtmain.lib;Qt5Widgets.lib;Qt5Gui.lib;Qt5Core.lib;%(AdditionalDependencies)
+ msimg32.lib;winmm.lib;Dinput8.lib;dxguid.lib;Iphlpapi.lib;qtmain.lib;Qt5Widgets.lib;Qt5Gui.lib;Qt5Core.lib;Qt5Network.lib;Qt5Concurrent.lib;%(AdditionalDependencies)
$(CG_LIB64_PATH)
@@ -604,7 +604,7 @@
true
true
true
- msimg32.lib;winmm.lib;Dinput8.lib;dxguid.lib;Iphlpapi.lib;qtmain.lib;Qt5Widgets.lib;Qt5Gui.lib;Qt5Core.lib;%(AdditionalDependencies)
+ msimg32.lib;winmm.lib;Dinput8.lib;dxguid.lib;Iphlpapi.lib;qtmain.lib;Qt5Widgets.lib;Qt5Gui.lib;Qt5Core.lib;Qt5Network.lib;Qt5Concurrent.lib;%(AdditionalDependencies)
$(CG_LIB_PATH)
@@ -630,7 +630,7 @@
true
true
true
- msimg32.lib;winmm.lib;Dinput8.lib;dxguid.lib;Iphlpapi.lib;qtmain.lib;Qt5Widgets.lib;Qt5Gui.lib;Qt5Core.lib;%(AdditionalDependencies)
+ msimg32.lib;winmm.lib;Dinput8.lib;dxguid.lib;Iphlpapi.lib;qtmain.lib;Qt5Widgets.lib;Qt5Gui.lib;Qt5Core.lib;Qt5Network.lib;Qt5Concurrent.lib;%(AdditionalDependencies)
$(CG_LIB_PATH)
@@ -707,7 +707,7 @@
true
true
true
- msimg32.lib;winmm.lib;Dinput8.lib;dxguid.lib;Iphlpapi.lib;qtmain.lib;Qt5Widgets.lib;Qt5Gui.lib;Qt5Core.lib;%(AdditionalDependencies)
+ msimg32.lib;winmm.lib;Dinput8.lib;dxguid.lib;Iphlpapi.lib;qtmain.lib;Qt5Widgets.lib;Qt5Gui.lib;Qt5Core.lib;Qt5Network.lib;Qt5Concurrent.lib;%(AdditionalDependencies)
$(CG_LIB64_PATH)
@@ -733,7 +733,7 @@
true
true
true
- msimg32.lib;winmm.lib;Dinput8.lib;dxguid.lib;Iphlpapi.lib;qtmain.lib;Qt5Widgets.lib;Qt5Gui.lib;Qt5Core.lib;%(AdditionalDependencies)
+ msimg32.lib;winmm.lib;Dinput8.lib;dxguid.lib;Iphlpapi.lib;qtmain.lib;Qt5Widgets.lib;Qt5Gui.lib;Qt5Core.lib;Qt5Network.lib;Qt5Concurrent.lib;%(AdditionalDependencies)
$(CG_LIB64_PATH)
@@ -759,48 +759,17 @@
CompileAsC
CompileAsC
-
-
+
/bigobj %(AdditionalOptions)
/bigobj %(AdditionalOptions)
/bigobj %(AdditionalOptions)
/bigobj %(AdditionalOptions)
-
- true
- true
- false
- false
- true
- false
- false
- true
- true
- true
- false
- false
- true
- false
- false
- true
-
-
- true
- true
- false
- false
- true
- false
- false
- true
- true
- true
- false
- false
- true
- false
- false
- true
+
+ /bigobj %(AdditionalOptions)
+ /bigobj %(AdditionalOptions)
+ /bigobj %(AdditionalOptions)
+ /bigobj %(AdditionalOptions)
@@ -813,36 +782,386 @@
false
false
false
- moc.exe "%(FullPath)" > "$(ProjectDir)MetaObjects\moc_%(Filename).cpp"
- moc.exe "%(FullPath)" > "$(ProjectDir)MetaObjects\moc_%(Filename).cpp"
- QT: Generate $(ProjectDir)MetaObjects\moc_%(Filename).cpp
- QT: Generate $(ProjectDir)MetaObjects\moc_%(Filename).cpp
- $(ProjectDir)MetaObjects\moc_%(Filename).cpp
- $(ProjectDir)MetaObjects\moc_%(Filename).cpp
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
false
false
- moc.exe "%(FullPath)" > "$(ProjectDir)MetaObjects\moc_%(Filename).cpp"
- moc.exe "%(FullPath)" > "$(ProjectDir)MetaObjects\moc_%(Filename).cpp"
- QT: Generate $(ProjectDir)MetaObjects\moc_%(Filename).cpp
- QT: Generate $(ProjectDir)MetaObjects\moc_%(Filename).cpp
- $(ProjectDir)MetaObjects\moc_%(Filename).cpp
- $(ProjectDir)MetaObjects\moc_%(Filename).cpp
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
false
false
- moc.exe "%(FullPath)" > "$(ProjectDir)MetaObjects\moc_%(Filename).cpp"
- moc.exe "%(FullPath)" > "$(ProjectDir)MetaObjects\moc_%(Filename).cpp"
- QT: Generate $(ProjectDir)MetaObjects\moc_%(Filename).cpp
- QT: Generate $(ProjectDir)MetaObjects\moc_%(Filename).cpp
- $(ProjectDir)MetaObjects\moc_%(Filename).cpp
- $(ProjectDir)MetaObjects\moc_%(Filename).cpp
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
false
false
- moc.exe "%(FullPath)" > "$(ProjectDir)MetaObjects\moc_%(Filename).cpp"
- moc.exe "%(FullPath)" > "$(ProjectDir)MetaObjects\moc_%(Filename).cpp"
- QT: Generate $(ProjectDir)MetaObjects\moc_%(Filename).cpp
- QT: Generate $(ProjectDir)MetaObjects\moc_%(Filename).cpp
- $(ProjectDir)MetaObjects\moc_%(Filename).cpp
- $(ProjectDir)MetaObjects\moc_%(Filename).cpp
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ false
+ false
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ false
+ false
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ false
+ false
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ false
+ false
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ false
+ false
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ false
+ false
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ false
+ false
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ false
+ false
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ false
+ false
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ false
+ false
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ false
+ false
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ false
+ false
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ false
+ false
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ false
+ false
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ false
+ false
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ false
+ false
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ false
+ false
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ false
+ false
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ false
+ false
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ false
+ false
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ false
+ false
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ false
+ false
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ false
+ false
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ false
+ false
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ false
+ false
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ false
+ false
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ false
+ false
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ false
+ false
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
false
false
true
@@ -857,42 +1176,42 @@
false
false
- moc.exe "%(FullPath)" > "$(ProjectDir)MetaObjects\moc_%(Filename).cpp"
- moc.exe "%(FullPath)" > "$(ProjectDir)MetaObjects\moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
false
false
- QT: Generate $(ProjectDir)MetaObjects\moc_%(Filename).cpp
- QT: Generate $(ProjectDir)MetaObjects\moc_%(Filename).cpp
- $(ProjectDir)MetaObjects\moc_%(Filename).cpp
- $(ProjectDir)MetaObjects\moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
false
false
false
false
false
false
- moc.exe "%(FullPath)" > "$(ProjectDir)MetaObjects\moc_%(Filename).cpp"
- moc.exe "%(FullPath)" > "$(ProjectDir)MetaObjects\moc_%(Filename).cpp"
- QT: Generate $(ProjectDir)MetaObjects\moc_%(Filename).cpp
- QT: Generate $(ProjectDir)MetaObjects\moc_%(Filename).cpp
- $(ProjectDir)MetaObjects\moc_%(Filename).cpp
- $(ProjectDir)MetaObjects\moc_%(Filename).cpp
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
false
false
- moc.exe "%(FullPath)" > "$(ProjectDir)MetaObjects\moc_%(Filename).cpp"
- moc.exe "%(FullPath)" > "$(ProjectDir)MetaObjects\moc_%(Filename).cpp"
- QT: Generate $(ProjectDir)MetaObjects\moc_%(Filename).cpp
- QT: Generate $(ProjectDir)MetaObjects\moc_%(Filename).cpp
- $(ProjectDir)MetaObjects\moc_%(Filename).cpp
- $(ProjectDir)MetaObjects\moc_%(Filename).cpp
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
false
false
- moc.exe "%(FullPath)" > "$(ProjectDir)MetaObjects\moc_%(Filename).cpp"
- moc.exe "%(FullPath)" > "$(ProjectDir)MetaObjects\moc_%(Filename).cpp"
- QT: Generate $(ProjectDir)MetaObjects\moc_%(Filename).cpp
- QT: Generate $(ProjectDir)MetaObjects\moc_%(Filename).cpp
- $(ProjectDir)MetaObjects\moc_%(Filename).cpp
- $(ProjectDir)MetaObjects\moc_%(Filename).cpp
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp"
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
+ %(RootDir)%(Directory)moc_%(Filename).cpp
false
false
true
From a88277f76dcc1570a46fd7e77502164a96974493 Mon Sep 17 00:00:00 2001
From: CozmoP <25121396+CozmoP@users.noreply.github.com>
Date: Tue, 15 Jan 2019 19:41:24 +0100
Subject: [PATCH 2/2] #undef mkdir
---
griffin/griffin_cpp.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/griffin/griffin_cpp.cpp b/griffin/griffin_cpp.cpp
index e34561659f..08b9dc2899 100644
--- a/griffin/griffin_cpp.cpp
+++ b/griffin/griffin_cpp.cpp
@@ -36,6 +36,9 @@ UI
#ifndef __APPLE__
#define HAVE_MAIN /* also requires defining in frontend.c */
#endif
+
+#undef mkdir
+
#include "../ui/drivers/ui_qt.cpp"
#include "../ui/drivers/qt/ui_qt_window.cpp"