Skip to content

Commit

Permalink
Merge pull request stijnherfst#34 from BogdanW3/Linux
Browse files Browse the repository at this point in the history 
Update to Linux support
  • Loading branch information
@stijnherfst
stijnherfst authored Jan 22, 2019
2 parents 98fed42 + 5ebd449 commit 1ced229
Show file tree
Hide file tree
Showing 2 changed files with 87 additions and 1 deletion.
86 changes: 85 additions & 1 deletion HiveWE/HiveWE.cbp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,15 @@
</ExtraCommands>
</Target>
</Build>
<Unit filename="AspectRatioPixmapLabel.cpp">
<Option target="Executable" />
</Unit>
<Unit filename="AspectRatioPixmapLabel.h">
<Option compile="1" />
<Option weight="0" />
<Option compiler="gcc" use="1" buildCommand='moc $file -o &quot;./GeneratedFiles/Linux/moc_$file_name.cpp&quot; &quot;-fstdafx.h&quot; &quot;-f../../$file_name.$file_ext&quot; -DUNICODE -DQT_CORE_LIB -DQT_GUI_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -D_UNICODE &quot;-I./GeneratedFiles&quot; &quot;-I.&quot; &quot;-I./GeneratedFiles/Linux/.&quot; &quot;-I/usr/include/qt/QtCore&quot; &quot;-I/usr/include/qt/QtGui&quot; &quot;-I/usr/include/qt/QtANGLE&quot; &quot;-I/usr/include/qt/QtOpenGL&quot; &quot;-I/usr/include/qt/QtWidgets&quot;\n' />
<Option target="Pre-Generate" />
</Unit>
<Unit filename="BLP.cpp">
<Option target="Executable" />
</Unit>
Expand Down Expand Up @@ -146,6 +155,12 @@
<Option compiler="gcc" use="1" buildCommand='moc $file -o &quot;./GeneratedFiles/Linux/moc_$file_name.cpp&quot; &quot;-fstdafx.h&quot; &quot;-f../../$file_name.$file_ext&quot; -DUNICODE -DQT_CORE_LIB -DQT_GUI_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -D_UNICODE &quot;-I./GeneratedFiles&quot; &quot;-I.&quot; &quot;-I./GeneratedFiles/Linux/.&quot; &quot;-I/usr/include/qt/QtCore&quot; &quot;-I/usr/include/qt/QtGui&quot; &quot;-I/usr/include/qt/QtANGLE&quot; &quot;-I/usr/include/qt/QtOpenGL&quot; &quot;-I/usr/include/qt/QtWidgets&quot;\n' />
<Option target="Pre-Generate" />
</Unit>
<Unit filename="DoodadBrush.cpp">
<Option target="Executable" />
</Unit>
<Unit filename="DoodadBrush.h">
<Option target="Executable" />
</Unit>
<Unit filename="DoodadPalette.cpp">
<Option target="Executable" />
</Unit>
Expand Down Expand Up @@ -185,6 +200,9 @@
<Unit filename="GPUTexture.h">
<Option target="Executable" />
</Unit>
<Unit filename="GeneratedFiles/Linux/moc_AspectRatioPixmapLabel.cpp">
<Option target="Executable" />
</Unit>
<Unit filename="GeneratedFiles/Linux/moc_ColorButton.cpp">
<Option target="Executable" />
</Unit>
Expand All @@ -206,12 +224,27 @@
<Unit filename="GeneratedFiles/Linux/moc_JassEditor.cpp">
<Option target="Executable" />
</Unit>
<Unit filename="GeneratedFiles/Linux/moc_MainRibbon.cpp">
<Option target="Executable" />
</Unit>
<Unit filename="GeneratedFiles/Linux/moc_MapInfoEditor.cpp">
<Option target="Executable" />
</Unit>
<Unit filename="GeneratedFiles/Linux/moc_Minimap.cpp">
<Option target="Executable" />
</Unit>
<Unit filename="GeneratedFiles/Linux/moc_Palette.cpp">
<Option target="Executable" />
</Unit>
<Unit filename="GeneratedFiles/Linux/moc_PathingPallete.cpp">
<Option target="Executable" />
</Unit>
<Unit filename="GeneratedFiles/Linux/moc_QRibbon.cpp">
<Option target="Executable" />
</Unit>
<Unit filename="GeneratedFiles/Linux/moc_Terrain.cpp">
<Option target="Executable" />
</Unit>
<Unit filename="GeneratedFiles/Linux/moc_TerrainPalette.cpp">
<Option target="Executable" />
</Unit>
Expand Down Expand Up @@ -248,6 +281,9 @@
<Unit filename="GeneratedFiles/ui_MapInfoEditor.h">
<Option target="Executable" />
</Unit>
<Unit filename="GeneratedFiles/ui_Minimap.h">
<Option target="Executable" />
</Unit>
<Unit filename="GeneratedFiles/ui_PathingPallete.h">
<Option target="Executable" />
</Unit>
Expand Down Expand Up @@ -368,6 +404,15 @@
<Unit filename="MPQ.h">
<Option target="Executable" />
</Unit>
<Unit filename="MainRibbon.cpp">
<Option target="Executable" />
</Unit>
<Unit filename="MainRibbon.h">
<Option compile="1" />
<Option weight="0" />
<Option compiler="gcc" use="1" buildCommand='moc $file -o &quot;./GeneratedFiles/Linux/moc_$file_name.cpp&quot; &quot;-fstdafx.h&quot; &quot;-f../../$file_name.$file_ext&quot; -DUNICODE -DQT_CORE_LIB -DQT_GUI_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -D_UNICODE &quot;-I./GeneratedFiles&quot; &quot;-I.&quot; &quot;-I./GeneratedFiles/Linux/.&quot; &quot;-I/usr/include/qt/QtCore&quot; &quot;-I/usr/include/qt/QtGui&quot; &quot;-I/usr/include/qt/QtANGLE&quot; &quot;-I/usr/include/qt/QtOpenGL&quot; &quot;-I/usr/include/qt/QtWidgets&quot;\n' />
<Option target="Pre-Generate" />
</Unit>
<Unit filename="Map.cpp">
<Option target="Executable" />
</Unit>
Expand Down Expand Up @@ -395,6 +440,26 @@
<Option compiler="gcc" use="1" buildCommand='uic -o &quot;./GeneratedFiles/ui_$file_name.h&quot; $file ' />
<Option target="Pre-Generate" />
</Unit>
<Unit filename="Minimap.cpp">
<Option target="Executable" />
</Unit>
<Unit filename="Minimap.h">
<Option compile="1" />
<Option compiler="gcc" use="1" buildCommand='moc $file -o &quot;./GeneratedFiles/Linux/moc_$file_name.cpp&quot; &quot;-fstdafx.h&quot; &quot;-f../../$file_name.$file_ext&quot; -DUNICODE -DQT_CORE_LIB -DQT_GUI_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -D_UNICODE &quot;-I./GeneratedFiles&quot; &quot;-I.&quot; &quot;-I./GeneratedFiles/Linux/.&quot; &quot;-I/usr/include/qt/QtCore&quot; &quot;-I/usr/include/qt/QtGui&quot; &quot;-I/usr/include/qt/QtANGLE&quot; &quot;-I/usr/include/qt/QtOpenGL&quot; &quot;-I/usr/include/qt/QtWidgets&quot;\n' />
<Option target="Pre-Generate" />
</Unit>
<Unit filename="Minimap.ui">
<Option target="Executable" />
</Unit>
<Unit filename="Palette.cpp">
<Option target="Executable" />
</Unit>
<Unit filename="Palette.h">
<Option compile="1" />
<Option weight="0" />
<Option compiler="gcc" use="1" buildCommand='moc $file -o &quot;./GeneratedFiles/Linux/moc_$file_name.cpp&quot; &quot;-fstdafx.h&quot; &quot;-f../../$file_name.$file_ext&quot; -DUNICODE -DQT_CORE_LIB -DQT_GUI_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -D_UNICODE &quot;-I./GeneratedFiles&quot; &quot;-I.&quot; &quot;-I./GeneratedFiles/Linux/.&quot; &quot;-I/usr/include/qt/QtCore&quot; &quot;-I/usr/include/qt/QtGui&quot; &quot;-I/usr/include/qt/QtANGLE&quot; &quot;-I/usr/include/qt/QtOpenGL&quot; &quot;-I/usr/include/qt/QtWidgets&quot;\n' />
<Option target="Pre-Generate" />
</Unit>
<Unit filename="PathingBrush.cpp">
<Option target="Executable" />
</Unit>
Expand Down Expand Up @@ -422,6 +487,15 @@
<Option compiler="gcc" use="1" buildCommand='uic -o &quot;./GeneratedFiles/ui_$file_name.h&quot; $file ' />
<Option target="Pre-Generate" />
</Unit>
<Unit filename="QRibbon.cpp">
<Option target="Executable" />
</Unit>
<Unit filename="QRibbon.h">
<Option compile="1" />
<Option weight="0" />
<Option compiler="gcc" use="1" buildCommand='moc $file -o &quot;./GeneratedFiles/Linux/moc_$file_name.cpp&quot; &quot;-fstdafx.h&quot; &quot;-f../../$file_name.$file_ext&quot; -DUNICODE -DQT_CORE_LIB -DQT_GUI_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -D_UNICODE &quot;-I./GeneratedFiles&quot; &quot;-I.&quot; &quot;-I./GeneratedFiles/Linux/.&quot; &quot;-I/usr/include/qt/QtCore&quot; &quot;-I/usr/include/qt/QtGui&quot; &quot;-I/usr/include/qt/QtANGLE&quot; &quot;-I/usr/include/qt/QtOpenGL&quot; &quot;-I/usr/include/qt/QtWidgets&quot;\n' />
<Option target="Pre-Generate" />
</Unit>
<Unit filename="Quadtree.cpp">
<Option target="Executable" />
</Unit>
Expand Down Expand Up @@ -451,7 +525,11 @@
<Unit filename="Terrain.cpp">
<Option target="Executable" />
</Unit>
<Unit filename="Terrain.h" />
<Unit filename="Terrain.h">
<Option compile="1" />
<Option compiler="gcc" use="1" buildCommand='moc $file -o &quot;./GeneratedFiles/Linux/moc_$file_name.cpp&quot; &quot;-fstdafx.h&quot; &quot;-f../../$file_name.$file_ext&quot; -DUNICODE -DQT_CORE_LIB -DQT_GUI_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -D_UNICODE &quot;-I./GeneratedFiles&quot; &quot;-I.&quot; &quot;-I./GeneratedFiles/Linux/.&quot; &quot;-I/usr/include/qt/QtCore&quot; &quot;-I/usr/include/qt/QtGui&quot; &quot;-I/usr/include/qt/QtANGLE&quot; &quot;-I/usr/include/qt/QtOpenGL&quot; &quot;-I/usr/include/qt/QtWidgets&quot;\n' />
<Option target="Pre-Generate" />
</Unit>
<Unit filename="TerrainBrush.cpp">
<Option target="Executable" />
</Unit>
Expand All @@ -471,6 +549,12 @@
<Option compiler="gcc" use="1" buildCommand='uic -o &quot;./GeneratedFiles/ui_$file_name.h&quot; $file ' />
<Option target="Pre-Generate" />
</Unit>
<Unit filename="TerrainUndo.cpp">
<Option target="Executable" />
</Unit>
<Unit filename="TerrainUndo.h">
<Option target="Executable" />
</Unit>
<Unit filename="Texture.cpp">
<Option target="Executable" />
</Unit>
Expand Down
2 changes: 2 additions & 0 deletions HiveWE/main.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
#include "stdafx.h"

#ifdef WIN32
// To force HiveWE to run on the discrete GPU if available
extern "C" {
__declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1;
__declspec(dllexport) unsigned long NvOptimusEnablement = 1;
}
#endif

int main(int argc, char *argv[]) {
QSurfaceFormat format;
Expand Down

0 comments on commit 1ced229

Please sign in to comment.