mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-06-30 21:36:33 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into travis

Browse Source
This commit is contained in:
Simon Detheridge
2015-06-04 17:24:42 +01:00
parent 1e88aa740c 5bd593b42f
commit 91006edf34
25 changed files with 352 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Builds/MSVC/VS2013/Fractorium.vcxproj
View File

@ -824,6 +824,7 @@ xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)"</
<ClInclude Include="..\..\..\Source\Fractorium\FractoriumCommon.h" />
<ClInclude Include="..\..\..\Source\Fractorium\FractoriumEmberController.h" />
<ClInclude Include="..\..\..\Source\Fractorium\GLEmberController.h" />
<ClInclude Include="..\..\..\Source\Fractorium\PaletteTableWidgetItem.h" />
<ClInclude Include="..\..\..\Source\Fractorium\resource.h" />
<ClInclude Include="GeneratedFiles\ui_AboutDialog.h" />
<ClInclude Include="GeneratedFiles\ui_FinalRenderDialog.h" />

3
Builds/MSVC/VS2013/Fractorium.vcxproj.filters
View File

@ -297,6 +297,9 @@
<ClInclude Include="..\..\..\Source\Fractorium\FractoriumCommon.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Fractorium\PaletteTableWidgetItem.h">
<Filter>Widgets</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\..\Source\Fractorium\Fractorium.qrc">

3
Builds/QtCreator/Fractorium/Fractorium.pro
View File

@ -74,7 +74,8 @@ HEADERS += \
../../../Source/EmberCommon/JpegUtils.h \
../../../Source/EmberCommon/EmberCommonPch.h \
../../../Source/Fractorium/FractoriumCommon.h \
../../../Source/Fractorium/DoubleSpinBoxTableItemDelegate.h
../../../Source/Fractorium/DoubleSpinBoxTableItemDelegate.h \
../../../Source/Fractorium/PaletteTableWidgetItem.h
FORMS += \
../../../Source/Fractorium/AboutDialog.ui \