mirror of
				https://bitbucket.org/mfeemster/fractorium.git
				synced 2025-11-03 17:50:27 -05:00 
			
		
		
		
	--Bug fixes
-Add Qt DLLs to Visual Studio and Qt Creator post build steps just to be safe and to make it easier to copy out.
This commit is contained in:
		@ -78,6 +78,13 @@
 | 
				
			|||||||
    <PostBuildEvent>
 | 
					    <PostBuildEvent>
 | 
				
			||||||
      <Command>xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Deps\*.dll" "$(OutDir)"
 | 
					      <Command>xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Deps\*.dll" "$(OutDir)"
 | 
				
			||||||
xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)"
 | 
					xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)"
 | 
				
			||||||
 | 
					xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\dark.qss" "$(OutDir)"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					xcopy /F /Y /R /D "$(QTDIR)\bin\Qt5Cored.dll" "$(OutDir)"
 | 
				
			||||||
 | 
					xcopy /F /Y /R /D "$(QTDIR)\bin\Qt5Guid.dll" "$(OutDir)"
 | 
				
			||||||
 | 
					xcopy /F /Y /R /D "$(QTDIR)\bin\Qt5Widgetsd.dll" "$(OutDir)"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					xcopy /F /Y /R /D "$(QTDIR)\plugins\platforms\qwindowsd.dll" "$(OutDir)\platforms\"
 | 
				
			||||||
</Command>
 | 
					</Command>
 | 
				
			||||||
    </PostBuildEvent>
 | 
					    </PostBuildEvent>
 | 
				
			||||||
  </ItemDefinitionGroup>
 | 
					  </ItemDefinitionGroup>
 | 
				
			||||||
@ -112,7 +119,13 @@ xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)"
 | 
				
			|||||||
    <PostBuildEvent>
 | 
					    <PostBuildEvent>
 | 
				
			||||||
      <Command>xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Deps\*.dll" "$(OutDir)"
 | 
					      <Command>xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Deps\*.dll" "$(OutDir)"
 | 
				
			||||||
xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)"
 | 
					xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)"
 | 
				
			||||||
</Command>
 | 
					xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\dark.qss" "$(OutDir)"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					xcopy /F /Y /R /D "$(QTDIR)\bin\Qt5Core.dll" "$(OutDir)"
 | 
				
			||||||
 | 
					xcopy /F /Y /R /D "$(QTDIR)\bin\Qt5Gui.dll" "$(OutDir)"
 | 
				
			||||||
 | 
					xcopy /F /Y /R /D "$(QTDIR)\bin\Qt5Widgets.dll" "$(OutDir)"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					xcopy /F /Y /R /D "$(QTDIR)\plugins\platforms\qwindows.dll" "$(OutDir)\platforms\"</Command>
 | 
				
			||||||
    </PostBuildEvent>
 | 
					    </PostBuildEvent>
 | 
				
			||||||
  </ItemDefinitionGroup>
 | 
					  </ItemDefinitionGroup>
 | 
				
			||||||
  <ItemGroup>
 | 
					  <ItemGroup>
 | 
				
			||||||
 | 
				
			|||||||
@ -20,9 +20,25 @@ PRJ_SRC_DIR = $$absolute_path($$EMBER_ROOT/../Source/Fractorium)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#Qt will be installed on a system wide level on *nix. It should be the same for Windows, but copy it local just to be safe.
 | 
					#Qt will be installed on a system wide level on *nix. It should be the same for Windows, but copy it local just to be safe.
 | 
				
			||||||
win32 {
 | 
					win32 {
 | 
				
			||||||
 | 
					CONFIG(release, debug|release) {
 | 
				
			||||||
	qtfiles.path = $$BIN_INSTALL_DIR
 | 
						qtfiles.path = $$BIN_INSTALL_DIR
 | 
				
			||||||
	qtfiles.files = $$(QTDIR)\bin\Qt5Core.dll $$(QTDIR)\bin\Qt5Gui.dll $$(QTDIR)\bin\Qt5Widgets.dll
 | 
						qtfiles.files = $$(QTDIR)\bin\Qt5Core.dll $$(QTDIR)\bin\Qt5Gui.dll $$(QTDIR)\bin\Qt5Widgets.dll
 | 
				
			||||||
	INSTALLS += qtfiles
 | 
						INSTALLS += qtfiles
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						qtplatforms.path = $$BIN_INSTALL_DIR\platforms
 | 
				
			||||||
 | 
						qtplatforms.files = $$(QTDIR)\plugins\platforms\qwindows.dll
 | 
				
			||||||
 | 
						INSTALLS += qtplatforms
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					CONFIG(debug, debug|release) {
 | 
				
			||||||
 | 
						qtfiles.path = $$BIN_INSTALL_DIR
 | 
				
			||||||
 | 
						qtfiles.files = $$(QTDIR)\bin\Qt5Cored.dll $$(QTDIR)\bin\Qt5Guid.dll $$(QTDIR)\bin\Qt5Widgetsd.dll
 | 
				
			||||||
 | 
						INSTALLS += qtfiles
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						qtplatforms.path = $$BIN_INSTALL_DIR\platforms
 | 
				
			||||||
 | 
						qtplatforms.files = $$(QTDIR)\plugins\platforms\qwindowsd.dll
 | 
				
			||||||
 | 
						INSTALLS += qtplatforms
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#For some reason, a Qt project needs to be told to look at itself.
 | 
					#For some reason, a Qt project needs to be told to look at itself.
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user