diff --git a/.gitignore b/.gitignore
index 85a3f168..ef6fbad1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ src/Revision.h
/projects/msvc/.vs
/projects/msvc/GLideN64.VC.VC.opendb
/projects/msvc/GLideN64.VC.db
+/projects/msvc/GeneratedFiles
diff --git a/projects/msvc/GLideNUI.vcxproj b/projects/msvc/GLideNUI.vcxproj
index d5cec806..c2f4041a 100644
--- a/projects/msvc/GLideNUI.vcxproj
+++ b/projects/msvc/GLideNUI.vcxproj
@@ -46,6 +46,7 @@
+ _WINDOWS;UNICODE;WIN32;QT_STATICPLUGIN;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;QT_UITOOLS_LIB;QT_WINEXTRAS_LIB;%(PreprocessorDefinitions)
$(QTDIR)\include;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtCore;release;.;$(QTDIR)\mkspecs\win32-msvc2013;.\GeneratedFiles;$(QTDIR)\include\QtUiTools;$(QTDIR)\include\QtWinExtras;%(AdditionalIncludeDirectories)
-Zm200 -w34100 -w34189 %(AdditionalOptions)
$(IntDir)
@@ -63,86 +64,41 @@
$(QTDIR)\lib;$(QTDIR)\plugins\platforms;$(QTDIR)\plugins\imageformats
+ imm32.lib;Ws2_32.lib
+ DEBUG_DUMP;_DEBUG;%(PreprocessorDefinitions)
ProgramDatabase
Disabled
MultiThreadedDebug
+ true
+
+ qtpcred.lib;qtmaind.lib;qwindowsd.lib;qicod.lib;qtharfbuzzngd.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5PlatformSupportd.lib
+
+
+ Qt5UiToolsd.lib;Qt5WinExtrasd.lib;%(AdditionalDependencies)
+
+ QT_NO_DEBUG;NDEBUG;%(PreprocessorDefinitions)
None
MaxSpeed
MultiThreaded
true
-
-
-
- _WINDOWS;UNICODE;WIN32;QT_STATICPLUGIN;QT_NO_DEBUG;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;NDEBUG;QT_UITOOLS_LIB;QT_WINEXTRAS_LIB;%(PreprocessorDefinitions)
-
- imm32.lib;Ws2_32.lib;qtpcre.lib;qtmain.lib;qwindows.lib;qico.lib;qtharfbuzzng.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5PlatformSupport.lib
- true
+ qtpcre.lib;qtmain.lib;qwindows.lib;qico.lib;qtharfbuzzng.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5PlatformSupport.lib
-
- _WINDOWS;UNICODE;WIN32;QT_NO_DEBUG;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;%(PreprocessorDefinitions)
- $(OutDir)\$(InputName).res
-
Qt5UiTools.lib;Qt5WinExtras.lib;%(AdditionalDependencies)
-
-
-
- _WINDOWS;UNICODE;WIN32;QT_STATICPLUGIN;QT_NO_DEBUG;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;NDEBUG;QT_UITOOLS_LIB;QT_WINEXTRAS_LIB;%(PreprocessorDefinitions)
-
- imm32.lib;Ws2_32.lib;qtpcre.lib;qtmain.lib;qwindows.lib;qico.lib;qtharfbuzzng.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5PlatformSupport.lib
true
-
- _WINDOWS;UNICODE;WIN32;QT_NO_DEBUG;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;%(PreprocessorDefinitions)
- $(OutDir)\$(InputName).res
-
-
- Qt5UiTools.lib;Qt5WinExtras.lib;%(AdditionalDependencies)
-
-
-
-
- DEBUG_DUMP;_DEBUG;_WINDOWS;UNICODE;WIN32;QT_STATICPLUGIN;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;QT_UITOOLS_LIB;QT_WINEXTRAS_LIB;%(PreprocessorDefinitions)
- true
-
-
- imm32.lib;Ws2_32.lib;qtpcred.lib;qtmaind.lib;qwindowsd.lib;qicod.lib;qtharfbuzzngd.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5PlatformSupportd.lib
-
-
- _WINDOWS;UNICODE;WIN32;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;_DEBUG;%(PreprocessorDefinitions)
- $(OutDir)\$(InputName).res
-
-
- Qt5UiToolsd.lib;Qt5WinExtrasd.lib;%(AdditionalDependencies)
-
-
-
-
- DEBUG_DUMP;_DEBUG;_WINDOWS;UNICODE;WIN32;QT_STATICPLUGIN;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;QT_UITOOLS_LIB;QT_WINEXTRAS_LIB;%(PreprocessorDefinitions)
- true
-
-
- imm32.lib;Ws2_32.lib;qtpcred.lib;qtmaind.lib;qwindowsd.lib;qicod.lib;qtharfbuzzngd.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5PlatformSupportd.lib
-
-
- _WINDOWS;UNICODE;WIN32;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;_DEBUG;%(PreprocessorDefinitions)
- $(OutDir)\$(InputName).res
-
-
- Qt5UiToolsd.lib;Qt5WinExtrasd.lib;%(AdditionalDependencies)
-
@@ -151,100 +107,43 @@
true
- true
- true
+ true
-
-
-
-
-
-
-
+
- true
- true
+ true
- true
- true
+ true
- setlocal
+ setlocal
if errorlevel 1 goto VCEnd
if errorlevel 1 goto VCEnd
endlocal
"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DQT_STATICPLUGIN -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_UITOOLS_LIB -DQT_WINEXTRAS_LIB "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I." "-I$(QTDIR)\mkspecs\win32-msvc2013" "-I.\GeneratedFiles" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWinExtras"
- setlocal
-if errorlevel 1 goto VCEnd
-if errorlevel 1 goto VCEnd
-endlocal
-"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DQT_STATICPLUGIN -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_UITOOLS_LIB -DQT_WINEXTRAS_LIB "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I." "-I$(QTDIR)\mkspecs\win32-msvc2013" "-I.\GeneratedFiles" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWinExtras"
- Moc%27ing AboutDialog.h...
- Moc%27ing AboutDialog.h...
- setlocal
-if errorlevel 1 goto VCEnd
-if errorlevel 1 goto VCEnd
-endlocal
-"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -DDEBUG_DUMP -D_DEBUG -D_WINDOWS -DUNICODE -DWIN32 -DQT_STATICPLUGIN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_UITOOLS_LIB -DQT_WINEXTRAS_LIB "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I." "-I$(QTDIR)\mkspecs\win32-msvc2013" "-I.\GeneratedFiles" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWinExtras"
- setlocal
-if errorlevel 1 goto VCEnd
-if errorlevel 1 goto VCEnd
-endlocal
-"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -DDEBUG_DUMP -D_DEBUG -D_WINDOWS -DUNICODE -DWIN32 -DQT_STATICPLUGIN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_UITOOLS_LIB -DQT_WINEXTRAS_LIB "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I." "-I$(QTDIR)\mkspecs\win32-msvc2013" "-I.\GeneratedFiles" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWinExtras"
- Moc%27ing AboutDialog.h...
- Moc%27ing AboutDialog.h...
- $(ConfigurationName)\moc_%(Filename).cpp
- $(ConfigurationName)\moc_%(Filename).cpp
- $(ConfigurationName)\moc_%(Filename).cpp
- $(ConfigurationName)\moc_%(Filename).cpp
- $(QTDIR)\bin\moc.exe;%(FullPath)
- $(QTDIR)\bin\moc.exe;%(FullPath)
- $(QTDIR)\bin\moc.exe;%(FullPath)
- $(QTDIR)\bin\moc.exe;%(FullPath)
+ Moc%27ing AboutDialog.h...
+ $(ConfigurationName)\moc_%(Filename).cpp
+ $(QTDIR)\bin\moc.exe;%(FullPath)
- setlocal
+ setlocal
if errorlevel 1 goto VCEnd
if errorlevel 1 goto VCEnd
endlocal
"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DQT_STATICPLUGIN -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_UITOOLS_LIB -DQT_WINEXTRAS_LIB "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I." "-I$(QTDIR)\mkspecs\win32-msvc2013" "-I.\GeneratedFiles" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWinExtras"
- setlocal
-if errorlevel 1 goto VCEnd
-if errorlevel 1 goto VCEnd
-endlocal
-"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DQT_STATICPLUGIN -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_UITOOLS_LIB -DQT_WINEXTRAS_LIB "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I." "-I$(QTDIR)\mkspecs\win32-msvc2013" "-I.\GeneratedFiles" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWinExtras"
- Moc%27ing ConfigDialog.h...
- Moc%27ing ConfigDialog.h...
- setlocal
-if errorlevel 1 goto VCEnd
-if errorlevel 1 goto VCEnd
-endlocal
-"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -DDEBUG_DUMP -D_DEBUG -D_WINDOWS -DUNICODE -DWIN32 -DQT_STATICPLUGIN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_UITOOLS_LIB -DQT_WINEXTRAS_LIB "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I." "-I$(QTDIR)\mkspecs\win32-msvc2013" "-I.\GeneratedFiles" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWinExtras"
- setlocal
-if errorlevel 1 goto VCEnd
-if errorlevel 1 goto VCEnd
-endlocal
-"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -DDEBUG_DUMP -D_DEBUG -D_WINDOWS -DUNICODE -DWIN32 -DQT_STATICPLUGIN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_UITOOLS_LIB -DQT_WINEXTRAS_LIB "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I." "-I$(QTDIR)\mkspecs\win32-msvc2013" "-I.\GeneratedFiles" "-I$(QTDIR)\include\QtUiTools" "-I$(QTDIR)\include\QtWinExtras"
- Moc%27ing ConfigDialog.h...
- Moc%27ing ConfigDialog.h...
- $(ConfigurationName)\moc_%(Filename).cpp
- $(ConfigurationName)\moc_%(Filename).cpp
- $(ConfigurationName)\moc_%(Filename).cpp
- $(ConfigurationName)\moc_%(Filename).cpp
- $(QTDIR)\bin\moc.exe;%(FullPath)
- $(QTDIR)\bin\moc.exe;%(FullPath)
- $(QTDIR)\bin\moc.exe;%(FullPath)
- $(QTDIR)\bin\moc.exe;%(FullPath)
+ Moc%27ing ConfigDialog.h...
+ $(ConfigurationName)\moc_%(Filename).cpp
+ $(QTDIR)\bin\moc.exe;%(FullPath)
@@ -255,68 +154,29 @@ endlocal
Document
- $(QTDIR)\bin\uic.exe;%(AdditionalInputs)
- $(QTDIR)\bin\uic.exe;%(AdditionalInputs)
- "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"
- "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"
- Uic%27ing %(Identity)...
- Uic%27ing %(Identity)...
- .\GeneratedFiles\ui_%(Filename).h;%(Outputs)
- .\GeneratedFiles\ui_%(Filename).h;%(Outputs)
- $(QTDIR)\bin\uic.exe;%(AdditionalInputs)
- $(QTDIR)\bin\uic.exe;%(AdditionalInputs)
- "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"
- "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"
- Uic%27ing %(Identity)...
- Uic%27ing %(Identity)...
- .\GeneratedFiles\ui_%(Filename).h;%(Outputs)
- .\GeneratedFiles\ui_%(Filename).h;%(Outputs)
+ $(QTDIR)\bin\uic.exe;%(AdditionalInputs)
+ "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"
+ Uic%27ing %(Identity)...
+ .\GeneratedFiles\ui_%(Filename).h;%(Outputs)
Document
- $(QTDIR)\bin\uic.exe;%(AdditionalInputs)
- $(QTDIR)\bin\uic.exe;%(AdditionalInputs)
- "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"
- "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"
- Uic%27ing %(Identity)...
- Uic%27ing %(Identity)...
- .\GeneratedFiles\ui_%(Filename).h;%(Outputs)
- .\GeneratedFiles\ui_%(Filename).h;%(Outputs)
- $(QTDIR)\bin\uic.exe;%(AdditionalInputs)
- $(QTDIR)\bin\uic.exe;%(AdditionalInputs)
- "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"
- "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"
- Uic%27ing %(Identity)...
- Uic%27ing %(Identity)...
- .\GeneratedFiles\ui_%(Filename).h;%(Outputs)
- .\GeneratedFiles\ui_%(Filename).h;%(Outputs)
+ $(QTDIR)\bin\uic.exe;%(AdditionalInputs)
+ "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"
+ Uic%27ing %(Identity)...
+ .\GeneratedFiles\ui_%(Filename).h;%(Outputs)
- true
- true
- true
- true
+ true
Document
- %(FullPath);.\Icon.ico;%(AdditionalInputs)
- %(FullPath);.\Icon.ico;%(AdditionalInputs)
- "$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp
- "$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp
- Rcc%27ing %(Identity)...
- Rcc%27ing %(Identity)...
- .\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs)
- .\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs)
- %(FullPath);.\Icon.ico;%(AdditionalInputs)
- %(FullPath);.\Icon.ico;%(AdditionalInputs)
- "$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp
- "$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp
- Rcc%27ing %(Identity)...
- Rcc%27ing %(Identity)...
- .\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs)
- .\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs)
+ %(FullPath);.\Icon.ico;%(AdditionalInputs)
+ "$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp
+ Rcc%27ing %(Identity)...
+ .\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs)