Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

clang instead of default gcc #9

Closed
wants to merge 11 commits into from
Closed

clang instead of default gcc #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
42e9b43
Use clang instead of default gcc
Jan 14, 2019
38b4b4d
Fix some includes
Jan 14, 2019
f7ae2da
Merge branch 'master' of https://github.com/Jakz/openmom
Jan 14, 2019
97cb352
Merge branch 'master' of https://github.com/Jakz/openmom
Jan 15, 2019
85f181c
Fix another include
Jan 15, 2019
51c986d
Merge branch 'master' of https://github.com/Jakz/openmom
Jan 15, 2019
6ccfb71
Fix some includes
Jan 15, 2019
6790530
Merge branch 'master' of https://github.com/Jakz/openmom
Jan 15, 2019
4afcb7b
Merge branch 'master' of https://github.com/Jakz/openmom
Jan 15, 2019
b4d3ec9
Merge branch 'master' of https://github.com/Jakz/openmom
Jan 15, 2019
e098ad4
Merge branch 'master' of https://github.com/Jakz/openmom
Jan 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,16 @@ if ("${CMAKE_BUILD_TYPE}" STREQUAL "")
set(CMAKE_BUILD_TYPE "Debug")
endif()

if(APPLE)
if(APPLE OR UNIX)
set(CMAKE_CXX_COMPILER "/usr/bin/clang++")
set(CMAKE_C_COMPILER "/usr/bin/clang")
elseif(UNIX)

elseif(WIN32)
#set(SDL2_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libs/sdl2)
set(SDL2_LIBRARY C:\\SDL\\SDL2\\lib)
set(SDL2_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}\\libs\\sdl2\\win\\include)
#set(SDL2_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libs/sdl2)
set(SDL2_LIBRARY C:\\SDL\\SDL2\\lib)
set(SDL2_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}\\libs\\sdl2\\win\\include)

set(SDL2_IMAGE_LIBRARY C:\\SDL\\SDL2_image\\lib)
set(SDL2_IMAGE_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}\\libs\\sdl2\\win\\include)
set(SDL2_IMAGE_LIBRARY C:\\SDL\\SDL2_image\\lib)
set(SDL2_IMAGE_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}\\libs\\sdl2\\win\\include)
endif()

set(LIBRARY_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/libs)
Expand Down
2 changes: 1 addition & 1 deletion src/common/Util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include "common/Common.h"

#include "format.h"
#include "fmt/format.h"

#include <random>
#include <vector>
Expand Down
1 change: 0 additions & 1 deletion src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ int main(int argc, char* arg[])
#include "ui/views/OutpostView.h"

#include "Army.h"
#include "format.h"

const char* viewName(ViewID id)
{
Expand Down
2 changes: 1 addition & 1 deletion src/ui/views/NewGameView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "game/Game.h"
#include "game/mechanics/SpellMechanics.h"

#include "format.h"
#include "fmt/format.h"

#include "Messages.h"
#include "LocalPlayer.h" //TODO: required for error message, maybe unneeded
Expand Down