Skip to content
This repository has been archived by the owner on Sep 21, 2022. It is now read-only.

Commit

Permalink
Merge pull request #140 from MarkusRannare/bugfix_linux_output_name
Browse files Browse the repository at this point in the history
Bugfix linux output name
  • Loading branch information
MarkusRannare committed Oct 16, 2020
2 parents 2610514 + f9143dc commit f1cba34
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 15 deletions.
24 changes: 12 additions & 12 deletions .github/workflows/ci.yml
Expand Up @@ -10,25 +10,25 @@ jobs:
fail-fast: true
matrix:
name:
- Ubuntu 16.04 GCC
- Ubuntu 16.04 Clang
# - Ubuntu 16.04 GCC
# - Ubuntu 16.04 Clang
- Ubuntu 18.04 GCC
- Ubuntu 18.04 Clang
- Windows 2019 MSVC
# - Windows 2019 GCC
- macOS 10.15 GCC
- macOS 10.15 Clang
include:
- name: Ubuntu 16.04 GCC
os: ubuntu-16.04
compiler: gcc
cpp-compiler: g++

- name: Ubuntu 16.04 Clang
os: ubuntu-16.04
compiler: clang
cpp-compiler: clang++
packages: llvm-3.5
# - name: Ubuntu 16.04 GCC
# os: ubuntu-16.04
# compiler: gcc
# cpp-compiler: g++

#- name: Ubuntu 16.04 Clang
# os: ubuntu-16.04
# compiler: clang
# cpp-compiler: clang++
# packages: llvm-3.5

- name: Ubuntu 18.04 GCC
os: ubuntu-18.04
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Expand Up @@ -40,6 +40,10 @@ CMakeSettings.json
.kdev4/
*.kdev4

# CLion
.idea/
cmake-build-debug/

# Mac OS
.DS_Store

Expand Down
5 changes: 3 additions & 2 deletions CMakeLists.txt
Expand Up @@ -152,6 +152,7 @@ endif()

# Set properties let projects that use this project as a subdirectory know how to play along with it
set_target_properties(modio
PROPERTIES
OUTPUT_NAME "${PREFIX}modio"
PROPERTIES
PREFIX "${PREFIX}"
OUTPUT_NAME modio
SUFFIX "${POSTFIX}")
2 changes: 1 addition & 1 deletion src/Globals.cpp
Expand Up @@ -3,7 +3,7 @@

namespace modio
{
std::string VERSION = "v0.12.16 DEV";
std::string VERSION = "v0.12.17 DEV";
std::string API_KEY;
std::string ACCESS_TOKEN = "";
u32 GAME_ID;
Expand Down

0 comments on commit f1cba34

Please sign in to comment.