Revision 1060
Corrected Makefiles to work inside the trunk.
trunk/code/projects/diagnostic_station/stationCode/v1/Makefile | ||
---|---|---|
4 | 4 |
|
5 | 5 |
# Relative path to the root directory (containing lib directory) |
6 | 6 |
ifndef COLONYROOT |
7 |
COLONYROOT = ../.. |
|
7 |
COLONYROOT = ../../../../..
|
|
8 | 8 |
endif |
9 | 9 |
|
10 | 10 |
# Target file name (without extension). |
... | ... | |
116 | 116 |
endif |
117 | 117 |
|
118 | 118 |
# Place -I, -L options here |
119 |
CINCS = -I$(COLONYROOT)/lib/include/libdragonfly |
|
120 |
CINCS += -L$(COLONYROOT)/lib/bin |
|
119 |
CINCS = -I$(COLONYROOT)/code/lib/include/libdragonfly
|
|
120 |
CINCS += -L$(COLONYROOT)/code/lib/bin
|
|
121 | 121 |
ifdef USE_WIRELESS |
122 |
CINCS += -I$(COLONYROOT)/lib/include/libwireless |
|
122 |
CINCS += -I$(COLONYROOT)/code/lib/include/libwireless
|
|
123 | 123 |
endif |
124 | 124 |
|
125 | 125 |
#---------------- Compiler Options ---------------- |
trunk/code/projects/diagnostic_station/stationCode/templateFolder/Makefile | ||
---|---|---|
4 | 4 |
|
5 | 5 |
# Relative path to the root directory (containing lib directory) |
6 | 6 |
ifndef COLONYROOT |
7 |
COLONYROOT = ../.. |
|
7 |
COLONYROOT = ../../../../..
|
|
8 | 8 |
endif |
9 | 9 |
|
10 | 10 |
# Target file name (without extension). |
... | ... | |
116 | 116 |
endif |
117 | 117 |
|
118 | 118 |
# Place -I, -L options here |
119 |
CINCS = -I$(COLONYROOT)/lib/include/libdragonfly |
|
120 |
CINCS += -L$(COLONYROOT)/lib/bin |
|
119 |
CINCS = -I$(COLONYROOT)/code/lib/include/libdragonfly
|
|
120 |
CINCS += -L$(COLONYROOT)/code/lib/bin
|
|
121 | 121 |
ifdef USE_WIRELESS |
122 |
CINCS += -I$(COLONYROOT)/lib/include/libwireless |
|
122 |
CINCS += -I$(COLONYROOT)/code/lib/include/libwireless
|
|
123 | 123 |
endif |
124 | 124 |
|
125 | 125 |
#---------------- Compiler Options ---------------- |
trunk/code/projects/diagnostic_station/stationCode/BOM_LED_testing/Makefile | ||
---|---|---|
4 | 4 |
|
5 | 5 |
# Relative path to the root directory (containing lib directory) |
6 | 6 |
ifndef COLONYROOT |
7 |
COLONYROOT = ../.. |
|
7 |
COLONYROOT = ../../../../..
|
|
8 | 8 |
endif |
9 | 9 |
|
10 | 10 |
# Target file name (without extension). |
... | ... | |
116 | 116 |
endif |
117 | 117 |
|
118 | 118 |
# Place -I, -L options here |
119 |
CINCS = -I$(COLONYROOT)/lib/include/libdragonfly |
|
120 |
CINCS += -L$(COLONYROOT)/lib/bin |
|
119 |
CINCS = -I$(COLONYROOT)/code/lib/include/libdragonfly
|
|
120 |
CINCS += -L$(COLONYROOT)/code/lib/bin
|
|
121 | 121 |
ifdef USE_WIRELESS |
122 |
CINCS += -I$(COLONYROOT)/lib/include/libwireless |
|
122 |
CINCS += -I$(COLONYROOT)/code/lib/include/libwireless
|
|
123 | 123 |
endif |
124 | 124 |
|
125 | 125 |
#---------------- Compiler Options ---------------- |
Also available in: Unified diff