Better clang setup in Makefile
This commit is contained in:
parent
68c437d0fd
commit
cc644270e4
9
Makefile
9
Makefile
@ -1,11 +1,11 @@
|
||||
#Try using clang, if it's installed
|
||||
ifneq ($(shell command -v clang),)
|
||||
CC = clang
|
||||
CXX = $(patsubst g++,clang++, $(shell wx-config --cxx)) -std=c++98 -I/include
|
||||
else
|
||||
CXX = $(shell wx-config --cxx) -I/include
|
||||
CXX = clang++ -std=c++98
|
||||
endif
|
||||
|
||||
CXX += -Iinclude
|
||||
|
||||
SOURCES = $(wildcard include/**/*.cpp src/network/*.cpp src/settings/*.cpp include/*.cpp)
|
||||
OBJECTS = $(patsubst %.cpp,%.o, $(SOURCES))
|
||||
TARGET = build/Tyro.a
|
||||
@ -30,6 +30,9 @@ TESTS = $(patsubst %.cpp,%,$(TEST_SRC))
|
||||
|
||||
OS ?= $(shell uname -s)
|
||||
|
||||
ifeq ($(OS),Darwin)
|
||||
CXX += -mmacosx-version-min=10.5
|
||||
endif
|
||||
ifeq ($(OS),Windows_NT)
|
||||
LDLIBS += -L/lib
|
||||
endif
|
||||
|
@ -18,7 +18,7 @@ bool TyroApp::OnInit()
|
||||
this->SetAppName(APP_NAME);
|
||||
this->SetVendorName(APP_VENDOR);
|
||||
|
||||
MainFrame* frame = new MainFrame(0L, _("Tyro"));
|
||||
MainFrame* frame = new MainFrame(0L, "Tyro");
|
||||
|
||||
SetTopWindow(frame);
|
||||
|
||||
|
@ -2,7 +2,7 @@
|
||||
#define TYRO_CONFIG_H
|
||||
|
||||
#include "../common.h"
|
||||
#include "../../include/json/json.h"
|
||||
#include <json/json.h>
|
||||
|
||||
typedef Json::Value JsonValue;
|
||||
typedef Json::Reader JsonReader;
|
||||
|
Loading…
Reference in New Issue
Block a user