diff --git a/projects/msvc/GLideN64.vcxproj b/projects/msvc/GLideN64.vcxproj index 1fb67b34..3545ed08 100644 --- a/projects/msvc/GLideN64.vcxproj +++ b/projects/msvc/GLideN64.vcxproj @@ -190,12 +190,12 @@ copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir)") - GLideNUI\debug\GLideNUI.lib;%(AdditionalDependencies) + bin\Win32\Debug\lib\GLideNUI.lib;%(AdditionalDependencies) - GLideNUI\release\GLideNUI.lib;%(AdditionalDependencies) + bin\Win32\Release\lib\GLideNUI.lib;%(AdditionalDependencies) /LTCG %(AdditionalOptions) diff --git a/projects/msvc/GLideNUI.vcxproj b/projects/msvc/GLideNUI.vcxproj index 12d4523c..be516daf 100644 --- a/projects/msvc/GLideNUI.vcxproj +++ b/projects/msvc/GLideNUI.vcxproj @@ -25,101 +25,68 @@ 8.1 - + $(DefaultPlatformToolset) - release\ false NotSet StaticLibrary - release\ - GLideNUI - - - $(DefaultPlatformToolset) - release\ - false - NotSet - StaticLibrary - release\ - GLideNUI - - - $(DefaultPlatformToolset) - debug\ - false - NotSet - StaticLibrary - debug\ - GLideNUI - - - $(DefaultPlatformToolset) - debug\ - false - NotSet - StaticLibrary - debug\ GLideNUI - - - - - - - - - - + $(SolutionDir)bin\$(Platform)\$(Configuration)\lib\ $(SolutionDir)build\$(Platform)\$(Configuration)\$(ProjectName)\ - $(ProjectName) - $(ProjectName) - true - true - $(ProjectName) - $(ProjectName) - true - true + $(ProjectName) + true - + $(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 -Zc:strictStrings -w34100 -w34189 %(AdditionalOptions) - release\ + -Zm200 -w34100 -w34189 %(AdditionalOptions) + $(IntDir) false - None Sync $(IntDir) - MaxSpeed - _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) false - $(IntDir)vc$(PlatformToolsetVersion).pdb - MultiThreaded + $(IntDir)vc$(VisualStudioVersion).pdb true true true Level3 - true + $(OutDir)\GLideNUI.lib - $(OutDir)\GLideNUI.lib - true - imm32.lib;Ws2_32.lib;qtpcre.lib;qtmain.lib;qwindows.lib;qico.lib;qtharfbuzzng.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5PlatformSupport.lib $(QTDIR)\lib;$(QTDIR)\plugins\platforms;$(QTDIR)\plugins\imageformats + + + + + ProgramDatabase + Disabled + MultiThreadedDebug + + + + + 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 - - Unsigned - None - 0 - _WINDOWS;UNICODE;WIN32;QT_NO_DEBUG;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;%(PreprocessorDefinitions) $(OutDir)\$(InputName).res @@ -130,36 +97,12 @@ - $(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 -Zc:strictStrings -w34100 -w34189 %(AdditionalOptions) - release\ - false - None - Sync - $(IntDir) - MaxSpeed _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) - false - $(IntDir)vc$(PlatformToolsetVersion).pdb - MultiThreaded - true - true - true - Level3 - true - GLideNUI\$(OutDir)\GLideNUI.lib - true imm32.lib;Ws2_32.lib;qtpcre.lib;qtmain.lib;qwindows.lib;qico.lib;qtharfbuzzng.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5PlatformSupport.lib - $(QTDIR)\lib;$(QTDIR)\plugins\platforms;$(QTDIR)\plugins\imageformats true - - Unsigned - None - 0 - _WINDOWS;UNICODE;WIN32;QT_NO_DEBUG;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;%(PreprocessorDefinitions) $(OutDir)\$(InputName).res @@ -170,35 +113,12 @@ - $(QTDIR)\include;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtCore;debug;.;$(QTDIR)\mkspecs\win32-msvc2013;.\GeneratedFiles;$(QTDIR)\include\QtUiTools;$(QTDIR)\include\QtWinExtras;%(AdditionalIncludeDirectories) - -Zm200 -w34100 -w34189 %(AdditionalOptions) - debug\ - false - ProgramDatabase - Sync - $(IntDir) - Disabled DEBUG_DUMP;_DEBUG;_WINDOWS;UNICODE;WIN32;QT_STATICPLUGIN;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;QT_UITOOLS_LIB;QT_WINEXTRAS_LIB;%(PreprocessorDefinitions) - false - MultiThreadedDebug - true - true - true - Level3 - $(IntDir)vc$(PlatformToolsetVersion).pdb true - $(OutDir)\GLideNUI.lib - true imm32.lib;Ws2_32.lib;qtpcred.lib;qtmaind.lib;qwindowsd.lib;qicod.lib;qtharfbuzzngd.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5PlatformSupportd.lib - $(QTDIR)\lib;$(QTDIR)\plugins\platforms;$(QTDIR)\plugins\imageformats - - Unsigned - None - 0 - _WINDOWS;UNICODE;WIN32;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;_DEBUG;%(PreprocessorDefinitions) $(OutDir)\$(InputName).res @@ -209,35 +129,12 @@ - $(QTDIR)\include;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtCore;debug;.;$(QTDIR)\mkspecs\win32-msvc2013;.\GeneratedFiles;$(QTDIR)\include\QtUiTools;$(QTDIR)\include\QtWinExtras;%(AdditionalIncludeDirectories) - -Zm200 -w34100 -w34189 %(AdditionalOptions) - debug\ - false - ProgramDatabase - Sync - $(IntDir) - Disabled DEBUG_DUMP;_DEBUG;_WINDOWS;UNICODE;WIN32;QT_STATICPLUGIN;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;QT_UITOOLS_LIB;QT_WINEXTRAS_LIB;%(PreprocessorDefinitions) - false - MultiThreadedDebug - true - true - true - Level3 - $(IntDir)vc$(PlatformToolsetVersion).pdb - true + true - $(OutDir)\GLideNUI.lib - true imm32.lib;Ws2_32.lib;qtpcred.lib;qtmaind.lib;qwindowsd.lib;qicod.lib;qtharfbuzzngd.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5PlatformSupportd.lib - $(QTDIR)\lib;$(QTDIR)\plugins\platforms;$(QTDIR)\plugins\imageformats - - Unsigned - None - 0 - _WINDOWS;UNICODE;WIN32;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;_DEBUG;%(PreprocessorDefinitions) $(OutDir)\$(InputName).res @@ -250,8 +147,7 @@ - true - true + true true