Skip to content

Commit

Permalink
Merge pull request #1181 from lairworks/makefileExeSuffix
Browse files Browse the repository at this point in the history
Add `.exe` suffix to executable Windows targets
  • Loading branch information
DanRStevens authored Dec 30, 2024
2 parents 0ea59b9 + d77987f commit 8c04aef
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ TARGET_OS ?= $(CURRENT_OS)
Windows_RUN_PREFIX := wine
RUN_PREFIX := $($(TARGET_OS)_RUN_PREFIX)

Windows_EXE_SUFFIX := .exe
EXE_SUFFIX := $($(TARGET_OS)_EXE_SUFFIX)

ROOTBUILDDIR := .build
BUILDDIRPREFIX := $(ROOTBUILDDIR)/$(CONFIG)_Linux_

Expand Down Expand Up @@ -62,7 +65,7 @@ include $(wildcard $(patsubst %.o,%.dep,$(OBJS)))

TESTDIR := test
TESTINTDIR := $(BUILDDIRPREFIX)test/intermediate
TESTOUTPUT := $(BUILDDIRPREFIX)test/test
TESTOUTPUT := $(BUILDDIRPREFIX)test/test$(EXE_SUFFIX)
TESTSRCS := $(shell find $(TESTDIR) -name '*.cpp')
TESTOBJS := $(patsubst $(TESTDIR)/%.cpp,$(TESTINTDIR)/%.o,$(TESTSRCS))

Expand Down Expand Up @@ -94,7 +97,7 @@ check: | test

TESTGRAPHICSDIR := test-graphics
TESTGRAPHICSINTDIR := $(BUILDDIRPREFIX)testGraphics/intermediate
TESTGRAPHICSOUTPUT := $(BUILDDIRPREFIX)testGraphics/testGraphics
TESTGRAPHICSOUTPUT := $(BUILDDIRPREFIX)testGraphics/testGraphics$(EXE_SUFFIX)
TESTGRAPHICSSRCS := $(shell find $(TESTGRAPHICSDIR) -name '*.cpp')
TESTGRAPHICSOBJS := $(patsubst $(TESTGRAPHICSDIR)/%.cpp,$(TESTGRAPHICSINTDIR)/%.o,$(TESTGRAPHICSSRCS))

Expand Down

0 comments on commit 8c04aef

Please sign in to comment.