Skip to content

Commit

Permalink
[BUILD] Added targetsuffix "_Linux" or "_OSX" to distinguish pure exe…
Browse files Browse the repository at this point in the history
…cutables

No need to add one for Game.app which is clearly for OSX
Adapted Travis script
  • Loading branch information
hsandt committed Jul 9, 2020
1 parent a69b7ee commit 95188eb
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
- PREMAKE_GENERATOR=gmake
# make with g++ build will represent Linux to deploy release
- DEPLOY=true
- DEPLOY_FILE=build/linux_Release/bin/Game
- DEPLOY_FILE=build/linux_Release/bin/Game_Linux
addons:
apt:
packages:
Expand Down Expand Up @@ -177,7 +177,6 @@ deploy:
- provider: releases
api_key:
secure: IhrVPJTMBqjDyaM2384WfLGlctyQKPWPLABaVWtLef9hEsGr2U1zSzvdTpChFfgFT8Rc6BZSyFeQTVUoNGMAx3Sb3ei44VBL7b3L4xPuRglnjesmgd0CwMmQjYYLn1eL8D599cxkobhkwMxgl4ynDXS/1e07g0HwDdw5e/MVguotnLvsu0PXmHJEJ6Vt7lgkCQb4qK207D2RDfxWHZYry9uLsC+RWG3c0rrEF+oYnUfrb7248OPGzOBQCzZtNcOzxP2YWw+Em2/cn2HbOjiYClM7gjZnVgisE+x4Xel7OPNKur2LtYEuoEMrvGd7r3m4xMmiNLWOb3XWzAQncqUiK1nLBoAdA9MQm7lIS8I+mpV0i9wvsWLmFM98gAKjY/bv5tcpjPC4iRlbWZCMm50+Oxpg4Jwkw60Te0teG2tSCdWEbqVYku6PIv699f6EfpADA4vyteC832sIirIJ/Q+XawnSJpHII/OcGgOzPujk/IzGLk8IZyM3z6ZVaXB0NSmdYKP7AdylsS3GKxIFCL+hf9hRQniXDgmZyf2ehGt1kdLuWayPjkmaWpu5rnen1JJARLAx8n2ozhMHQt32SrPOpDBxX4z05g1UR/rgbtN9ij65puHOcwXO0mOLwRlC5mb+/1PBYKfcC+9O2Gw6IrMlx4wbwah3cEBHVs7Vp3f8mVQ=
# currently, both Linux & OSX generate a pure executable `Game` (and not Game.app on OSX)
file: ${DEPLOY_FILE}
# ignore travis lint warning, the new `cleanup` is not working yet
skip_cleanup: true
Expand Down
6 changes: 6 additions & 0 deletions premake5.lua
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ project "Game"
frameworkdirs {"engine/third-party/SFML/extlibs/libs-osx/Frameworks"}

filter { "system:macosx", "action:gmake*"}
-- both OSX and Linux can generate extensionless executables, so add a suffix to distinguish them
targetsuffix "_OSX"

-- unlike ...dirs {}, linkoptions does not interpret paths
-- so we must enter them relatively to location "build", hence "../"
linkoptions {"-F ../engine/third-party/SFML/extlibs/libs-osx/Frameworks"}
Expand All @@ -72,6 +75,9 @@ project "Game"
}

filter { "system:linux" }
-- both OSX and Linux can generate extensionless executables, so add a suffix to distinguish them
targetsuffix "_Linux"

-- on Linux, we basically use the list on https://www.sfml-dev.org/tutorials/2.5/compile-with-cmake.php
-- without freetype, changing opengl -> GL (to have GLX functions) and uppercase FLAC
-- they must be installed locally on the machine
Expand Down

0 comments on commit 95188eb

Please sign in to comment.