80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #1067 from lemondrops/bugfix/makefile

Browse Source 
Small Makefile fixes
This commit is contained in:
Daniel Gurney
2020-11-12 22:35:13 +02:00
committed by GitHub
parent 474c0dfc1d 15a37256f6
commit 0deb6b96c3
1 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/win/Makefile.mingw
View File

@@ -66,9 +66,6 @@ ifeq ($(DEV_BUILD), y)
ifndef PAS16
PAS16 := n
endif
ifndef PORTABLE3
PORTABLE3 := y
endif
ifndef PS1M2133
PS1M2133 := y
endif
@@ -160,9 +157,6 @@ else
ifndef PAS16
PAS16 := n
endif
ifndef PORTABLE3
PORTABLE3 := n
endif
ifndef PS1M2133
PS1M2133 := n
endif
@@ -564,10 +558,6 @@ OPTS += -DUSE_PAS16
DEVBROBJ += snd_pas16.o
endif
ifeq ($(PORTABLE3), y)
OPTS += -DUSE_PORTABLE3
endif
ifeq ($(PS1M2133), y)
OPTS += -DUSE_PS1M2133
endif
@@ -885,15 +875,15 @@ else
%.d: %.c $(wildcard $*.d)
@echo $<
@$(CC) $(CFLAGS) $(DEPS) -E $< >NUL
@$(CC) $(CFLAGS) $(DEPS) -E $< >/dev/null
%.d: %.cc $(wildcard $*.d)
@echo $<
@$(CPP) $(CXXFLAGS) $(DEPS) -E $< >NUL
@$(CPP) $(CXXFLAGS) $(DEPS) -E $< >/dev/null
%.d: %.cpp $(wildcard $*.d)
@echo $<
@$(CPP) $(CXXFLAGS) $(DEPS) -E $< >NUL
@$(CPP) $(CXXFLAGS) $(DEPS) -E $< >/dev/null
endif
@@ -931,18 +921,18 @@ endif
clean:
@echo Cleaning objects..
@-rm -f *.o 2>NUL
@-rm -f *.res 2>NUL
@-rm -f *.o 2>/dev/null
@-rm -f *.res 2>/dev/null
clobber: clean
@echo Cleaning executables..
@-rm -f *.d 2>NUL
@-rm -f *.exe 2>NUL
# @-rm -f $(DEPFILE) 2>NUL
@-rm -f *.d 2>/dev/null
@-rm -f *.exe 2>/dev/null
# @-rm -f $(DEPFILE) 2>/dev/null
ifneq ($(AUTODEP), y)
depclean:
@-rm -f $(DEPFILE) 2>NUL
@-rm -f $(DEPFILE) 2>/dev/null
@echo Creating dependencies..
@echo # Run "make depends" to re-create this file. >$(DEPFILE)