Merge pull request #418 from phcoder/misc

Misc fixes
This commit is contained in:
Rob Loach 2022-05-13 18:02:14 -04:00 committed by GitHub
commit 6f3622d297
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions

View File

@ -1,5 +1,9 @@
TARGET_NAME := chailove
ifeq ($(VERBOSE),)
Q=@
endif
include Makefile.libretro
ifeq ($(STATIC_LINKING),1)
@ -23,10 +27,12 @@ else
endif
%.o: %.cpp
$(CXX) -c -o $@ $< $(CXXFLAGS) -include retro_endianness.h
@echo CXX $<
$(Q)$(CXX) -c -o $@ $< $(CXXFLAGS) -include retro_endianness.h
%.o: %.c
$(CC) -c -o $@ $< $(CFLAGS) -include retro_endianness.h
@echo CXX $<
$(Q)$(CC) -c -o $@ $< $(CFLAGS) -include retro_endianness.h
%.o: %.m
$(CC) -c -o $@ $< $(CFLAGS) -include retro_endianness.h

View File

@ -42,6 +42,7 @@ TARGET_NAME := chailove
GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
ifneq ($(GIT_VERSION)," unknown")
CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
CXXFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
endif
ifneq (,$(findstring msvc,$(platform)))

View File

@ -15,7 +15,7 @@ FileData::FileData(const std::string& filepath) : m_filepath(filepath) {
// Nothing.
}
FileData::FileData(const std::string& contents, const std::string& name) : m_contents(contents), m_filepath(name) {
FileData::FileData(const std::string& contents, const std::string& name) : m_filepath(name), m_contents(contents) {
// Nothing.
}