diff options
author | CNLohr <charles@cnlohr.com> | 2018-04-15 20:41:22 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-15 20:41:22 -0400 |
commit | 69b31d3c3b1957e59d7962722a4145bfb0db16f9 (patch) | |
tree | 927d843a553ef53217c283f19f16728b0ca51c50 /Makefile | |
parent | c73823e20c9ed2f2f8f6a13c2031971d8b7d7be2 (diff) | |
parent | 39a63badbb5864314a9d9e18c0871718ac5d2912 (diff) | |
download | libsurvive-69b31d3c3b1957e59d7962722a4145bfb0db16f9.tar.gz libsurvive-69b31d3c3b1957e59d7962722a4145bfb0db16f9.tar.bz2 |
Merge branch 'master' into tcc_build
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -42,7 +42,6 @@ else LIBSURVIVE_C:=$(POSERS) $(REDISTS) $(LIBSURVIVE_CORE) $(SBA) $(MINIMAL_NEEDED) $(AUX_NEEDED) endif - LIBSURVIVE_O:=$(LIBSURVIVE_C:%.c=$(OBJDIR)/%.o) LIBSURVIVE_D:=$(LIBSURVIVE_C:%.c=$(OBJDIR)/%.d) -include $(LIBSURVIVE_D) @@ -74,7 +73,6 @@ ifeq ($(UNAME), Darwin) REDISTS:=$(REDISTS) redist/hid-osx.c endif - ifdef LINUX_USE_HIDAPI CFLAGS:=$(CFLAGS) -DHIDAPI REDISTS:=$(REDISTS) redist/hid-linux.o |