Skip to content

Commit f78cd29

Browse files
ExtremsExtrems
committed
Clean up install-headers mess
1 parent 0dfd463 commit f78cd29

136 files changed

Lines changed: 39 additions & 68 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
build
22
deps
3-
include
43
lib
5-
gc/ogc/libversion.h
4+
include/ogc/libversion.h
65
docs
76
warn.log

‎Doxyfile‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -965,30 +965,30 @@ WARN_LOGFILE = warn.log
965965
# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
966966
# Note: If this tag is empty the current directory is searched.
967967

968-
INPUT = gc/ogc/card.h \
969-
gc/ogc/exi.h \
970-
gc/ogc/audio.h \
971-
gc/ogc/lwp.h \
972-
gc/ogc/cache.h \
973-
gc/ogc/irq.h \
974-
gc/ogc/dsp.h \
975-
gc/ogc/message.h \
976-
gc/ogc/mutex.h \
977-
gc/ogc/semaphore.h \
978-
gc/ogc/video.h \
979-
gc/ogc/system.h \
980-
gc/ogc/aram.h \
981-
gc/ogc/cond.h \
982-
gc/gccore.h \
983-
gc/ogc/gx_struct.h \
984-
gc/ogc/video_types.h \
985-
gc/ogc/dvd.h \
986-
gc/ogc/gx.h \
987-
gc/gctypes.h \
988-
gc/ogc/gu.h \
989-
gc/asndlib.h \
990-
gc/ogc/arqmgr.h \
991-
gc/ogc/consol.h
968+
INPUT = include/ogc/card.h \
969+
include/ogc/exi.h \
970+
include/ogc/audio.h \
971+
include/ogc/lwp.h \
972+
include/ogc/cache.h \
973+
include/ogc/irq.h \
974+
include/ogc/dsp.h \
975+
include/ogc/message.h \
976+
include/ogc/mutex.h \
977+
include/ogc/semaphore.h \
978+
include/ogc/video.h \
979+
include/ogc/system.h \
980+
include/ogc/aram.h \
981+
include/ogc/cond.h \
982+
include/gccore.h \
983+
include/ogc/gx_struct.h \
984+
include/ogc/video_types.h \
985+
include/ogc/dvd.h \
986+
include/ogc/gx.h \
987+
include/gctypes.h \
988+
include/ogc/gu.h \
989+
include/asndlib.h \
990+
include/ogc/arqmgr.h \
991+
include/ogc/consol.h
992992

993993
# This tag can be used to specify the character encoding of the source files
994994
# that Doxygen parses. Internally Doxygen uses the UTF-8 encoding. Doxygen uses

‎Makefile‎

Lines changed: 12 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,12 @@ ISOLIB := $(LIBDIR)/libiso9660
7070
WIIKEYBLIB := $(LIBDIR)/libwiikeyboard
7171

7272
#---------------------------------------------------------------------------------
73-
DEFINCS := -I$(BASEDIR) -I$(BASEDIR)/gc
74-
INCLUDES := $(DEFINCS) -I$(BASEDIR)/gc/netif -I$(BASEDIR)/gc/ipv4 \
75-
-I$(BASEDIR)/gc/ogc -I$(BASEDIR)/gc/ogc/machine \
76-
-I$(BASEDIR)/gc/modplay \
77-
-I$(BASEDIR)/gc/bte \
78-
-I$(BASEDIR)/gc/sdcard -I$(BASEDIR)/gc/wiiuse \
79-
-I$(BASEDIR)/gc/di
73+
DEFINCS := -I$(BASEDIR) -I$(INCDIR)
74+
INCLUDES := $(DEFINCS) -I$(LWIPDIR)/include -I$(LWIPDIR)/include/ipv4 -I$(LWIPDIR)/include/netif \
75+
-I$(INCDIR)/ogc -I$(INCDIR)/ogc/machine \
76+
-I$(INCDIR)/modplay \
77+
-I$(INCDIR)/bte \
78+
-I$(INCDIR)/sdcard
8079

8180
MACHDEP := -DBIGENDIAN -DGEKKO -mcpu=750 -meabi -msdata=eabi -mhard-float -ffunction-sections -fdata-sections
8281

@@ -182,26 +181,24 @@ WIIKEYBLIBOBJ := usbkeyboard.o keyboard.o ukbdmap.o wskbdutil.o
182181
all: wii cube
183182

184183
#---------------------------------------------------------------------------------
185-
wii: gc/ogc/libversion.h
184+
wii: $(INCDIR)/ogc/libversion.h
186185
#---------------------------------------------------------------------------------
187-
@[ -d $(INCDIR) ] || mkdir -p $(INCDIR)
188186
@[ -d $(LIBS)/wii ] || mkdir -p $(LIBS)/wii
189187
@[ -d $(DEPS)/wii ] || mkdir -p $(DEPS)/wii
190188
@[ -d $(BUILD)/wii ] || mkdir -p $(BUILD)/wii
191189
@$(MAKE) PLATFORM=wii libs -C $(BUILD)/wii -f $(CURDIR)/Makefile
192190

193191
#---------------------------------------------------------------------------------
194-
cube: gc/ogc/libversion.h
192+
cube: $(INCDIR)/ogc/libversion.h
195193
#---------------------------------------------------------------------------------
196-
@[ -d $(INCDIR) ] || mkdir -p $(INCDIR)
197194
@[ -d $(LIBS)/cube ] || mkdir -p $(LIBS)/cube
198195
@[ -d $(DEPS)/cube ] || mkdir -p $(DEPS)/cube
199196
@[ -d $(BUILD)/cube ] || mkdir -p $(BUILD)/cube
200197
@$(MAKE) PLATFORM=cube libs -C $(BUILD)/cube -f $(CURDIR)/Makefile
201198

202199

203200
#---------------------------------------------------------------------------------
204-
gc/ogc/libversion.h: .git/HEAD .git/index Makefile
201+
include/ogc/libversion.h: .git/HEAD .git/index Makefile
205202
#---------------------------------------------------------------------------------
206203
@echo "#ifndef __OGC_LIBVERSION_H__" > $@
207204
@echo "#define __OGC_LIBVERSION_H__" >> $@
@@ -263,33 +260,10 @@ $(BTELIB).a: $(BTEOBJ)
263260
$(WIIUSELIB).a: $(WIIUSEOBJ)
264261
#---------------------------------------------------------------------------------
265262

266-
.PHONY: libs wii cube install-headers install uninstall docs docker
263+
.PHONY: libs wii cube install uninstall docs docker
267264

268265
#---------------------------------------------------------------------------------
269-
install-headers:
270-
#---------------------------------------------------------------------------------
271-
@mkdir -p $(INCDIR)
272-
@mkdir -p $(INCDIR)/ogc/machine
273-
@mkdir -p $(INCDIR)/sys
274-
@mkdir -p $(INCDIR)/bte
275-
@mkdir -p $(INCDIR)/wiiuse
276-
@mkdir -p $(INCDIR)/modplay
277-
@mkdir -p $(INCDIR)/sdcard
278-
@mkdir -p $(INCDIR)/di
279-
@mkdir -p $(INCDIR)/wiikeyboard
280-
@cp ./gc/*.h $(INCDIR)
281-
@cp ./gc/ogc/*.h $(INCDIR)/ogc
282-
@cp ./gc/ogc/machine/*.h $(INCDIR)/ogc/machine
283-
@cp ./gc/sys/*.h $(INCDIR)/sys
284-
@cp ./gc/bte/*.h $(INCDIR)/bte
285-
@cp ./gc/wiiuse/*.h $(INCDIR)/wiiuse
286-
@cp ./gc/modplay/*.h $(INCDIR)/modplay
287-
@cp ./gc/sdcard/*.h $(INCDIR)/sdcard
288-
@cp ./gc/di/*.h $(INCDIR)/di
289-
@cp ./gc/wiikeyboard/*.h $(INCDIR)/wiikeyboard
290-
291-
#---------------------------------------------------------------------------------
292-
install: wii cube install-headers
266+
install: wii cube
293267
#---------------------------------------------------------------------------------
294268
@mkdir -p $(DESTDIR)$(DEVKITPRO)/libogc2/gamecube/lib
295269
@mkdir -p $(DESTDIR)$(DEVKITPRO)/libogc2/wii/lib
@@ -325,11 +299,9 @@ clean:
325299
rm -fr $(BUILD)
326300
rm -fr $(DEPS)
327301
rm -fr $(LIBS)
328-
rm -fr $(INCDIR)
329-
rm -f *.map
330302

331303
#---------------------------------------------------------------------------------
332-
docs: install-headers
304+
docs:
333305
#---------------------------------------------------------------------------------
334306
VERSTRING="$(VERSTRING)" doxygen Doxyfile
335307

‎README.md‎

Lines changed: 2 additions & 2 deletions

gc/aesndlib.h renamed to include/aesndlib.h

File renamed without changes.

gc/asndlib.h renamed to include/asndlib.h

File renamed without changes.

gc/bte/bd_addr.h renamed to include/bte/bd_addr.h

File renamed without changes.

gc/bte/bte.h renamed to include/bte/bte.h

File renamed without changes.

gc/debug.h renamed to include/debug.h

File renamed without changes.

gc/di/di.h renamed to include/di/di.h

File renamed without changes.

0 commit comments

Comments
 (0)