Skip to content

Commit

Permalink
makefile : remove unused NEW_MOUSE and conditionally include hhstdio.h .
Browse files Browse the repository at this point in the history
  • Loading branch information
frobiac committed Feb 7, 2013
1 parent 900a7d5 commit 8fa2ad5
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
4 changes: 0 additions & 4 deletions Config/LUFAConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@
#ifndef _LUFA_CONFIG_H_
#define _LUFA_CONFIG_H_

//#define NEW_MOUSE
//#define PS2MOUSE
//#define MOUSE_HAS_SCROLL_WHEELS

#if (ARCH == ARCH_AVR8)

/* Non-USB Related Configuration Tokens: */
Expand Down
15 changes: 13 additions & 2 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ SRC = $(LUFA_SRC_USB) \
$(SRCDIR)/dbg.c \
$(SRCDIR)/Descriptors.c \
$(SRCDIR)/keyboard_class.c \
$(SRCDIR)/hhstdio.c \
$(SRCDIR)/keymap.c \
$(SRCDIR)/analog.c \
$(SRCDIR)/macro.c \
Expand All @@ -38,15 +37,21 @@ SRC = $(LUFA_SRC_USB) \

LUFA_PATH = LUFA/LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
CC_FLAGS += -DNEW_MOUSE -DPS2MOUSE -DMOUSE_HAS_SCROLL_WHEELS
CC_FLAGS += -DPS2MOUSE -DMOUSE_HAS_SCROLL_WHEELS
CC_FLAGS += -DDEBUG_OUTPUT
#CC_FLAGS += -DMACOS
#CC_FLAGS += -DQWERTY
LD_FLAGS =

ifneq (,$(findstring DEBUG_OUTPUT,$(CC_FLAGS)))
SRC += $(SRCDIR)/hhstdio.c
endif

# Default target
all: version lufacheck macrocheck



# create some version information from git
version:
@$(SRCDIR)/version.sh > $(SRCDIR)/version.h
Expand All @@ -69,6 +74,12 @@ lufacheck:
echo -e "*** ERROR: LUFA/LUFA missing - see README for install instructions.\n*** Try to checkout LUFA source with\n*** git submodule init && git submodule update\n\n"; false;\
fi

ifneq (,$(findstring DEBUG_OUTPUT,$(CC_FLAGS)))
@echo "*** DEBUG is defined" ;
else
@echo "*** DEBUG is NOT defined";
endif


# check whether scrollwheel support is requested and complete
ifneq (,$(findstring MOUSE_HAS_SCROLL_WHEELS,$(CC_FLAGS)))
Expand Down

0 comments on commit 8fa2ad5

Please sign in to comment.