From 2b496698981e0a75428c810888ea50c28f8ae428 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 20 Aug 2017 00:50:04 +0200 Subject: [PATCH] Update Makefile.libogc --- Makefile.libogc | 374 +++++++++++++++++---------- wii/libogc/deps/empty.txt | 0 wii/libogc/libs/wii/libbte.a | Bin 472300 -> 472300 bytes wii/libogc/libs/wii/libdb.a | Bin 522152 -> 522152 bytes wii/libogc/libs/wii/libogc.a | Bin 3284452 -> 3284452 bytes wii/libogc/libs/wii/libwiikeyboard.a | Bin 133126 -> 133126 bytes wii/libogc/libs/wii/libwiiuse.a | Bin 416460 -> 416460 bytes 7 files changed, 231 insertions(+), 143 deletions(-) create mode 100644 wii/libogc/deps/empty.txt diff --git a/Makefile.libogc b/Makefile.libogc index a8ff32f3b9..f4cf82dfda 100644 --- a/Makefile.libogc +++ b/Makefile.libogc @@ -12,23 +12,85 @@ endif export PATH := $(DEVKITPPC)/bin:$(PATH) -export LIBOGC_MAJOR := 1 -export LIBOGC_MINOR := 8 -export LIBOGC_PATCH := 17 +ifeq ($(PLATFORM),) +PLATFORM=wii +endif -include $(DEVKITPPC)/base_rules +#--------------------------------------------------------------------------------- +# change shell on Snow Leopard +#--------------------------------------------------------------------------------- +UNAME_S := $(shell uname -s) +UNAME_R := $(shell uname -r) + +ifneq (,$(findstring Darwin,$(UNAME_S))) + ifneq (,$(findstring 10.8.0,$(UNAME_R))) + export SHELL=/bin/bash + endif +endif + +#--------------------------------------------------------------------------------- +# path to tools +#--------------------------------------------------------------------------------- +export PORTLIBS := $(DEVKITPRO)/portlibs/ppc +export PATH := $(DEVKITPPC)/bin:$(PORTLIBS)/bin:$(PATH) + +#--------------------------------------------------------------------------------- +# the prefix on the compiler executables +#--------------------------------------------------------------------------------- +PREFIX := powerpc-eabi- + +export AS := $(PREFIX)as +export CC := $(PREFIX)gcc +export CXX := $(PREFIX)g++ +export AR := $(PREFIX)ar +export OBJCOPY := $(PREFIX)objcopy + + +ISVC=$(or $(VCBUILDHELPER_COMMAND),$(MSBUILDEXTENSIONSPATH32),$(MSBUILDEXTENSIONSPATH)) + +#--------------------------------------------------------------------------------- +%.a: +#--------------------------------------------------------------------------------- + @rm -f $@ + $(AR) -rc $@ $^ + +#--------------------------------------------------------------------------------- +%.o: %.cpp + $(CXX) $(CXXFLAGS) -c $< -o $@ + +#--------------------------------------------------------------------------------- +%.o: %.c + $(CC) $(CFLAGS) -c $< -o $@ + +#--------------------------------------------------------------------------------- +%.o: %.m + $(CC) $(OBJCFLAGS) -c $< -o $@ + +#--------------------------------------------------------------------------------- +%.o: %.s + $(CC) -x assembler-with-cpp $(ASFLAGS) -c $< -o $@ + +#--------------------------------------------------------------------------------- +%.o: %.S + $(CC) -x assembler-with-cpp $(ASFLAGS) -c $< -o $@ + +#--------------------------------------------------------------------------------- +# canned command sequence for binary data +#--------------------------------------------------------------------------------- +define bin2o + bin2s -a 32 $< | $(AS) -o $(@) + echo "extern const u8" `(echo $( `(echo $(> `(echo $(> `(echo $( $@ - @echo "#define __LIBVERSION_H__" >> $@ - @echo >> $@ - @echo "#define _V_MAJOR_ $(LIBOGC_MAJOR)" >> $@ - @echo "#define _V_MINOR_ $(LIBOGC_MINOR)" >> $@ - @echo "#define _V_PATCH_ $(LIBOGC_PATCH)" >> $@ - @echo >> $@ - @echo "#define _V_DATE_ __DATE__" >> $@ - @echo "#define _V_TIME_ __TIME__" >> $@ - @echo >> $@ - @echo '#define _V_STRING "libOGC Release '$(LIBOGC_MAJOR).$(LIBOGC_MINOR).$(LIBOGC_PATCH)'"' >> $@ - @echo >> $@ - @echo "#endif // __LIBVERSION_H__" >> $@ +ifeq ($(PLATFORM),cube) +LIBRARIES += $(BBALIB).a +endif +ifeq ($(PLATFORM),wii) +LIBRARIES += $(BTELIB).a $(WIIUSELIB).a $(WIIKEYBLIB).a +endif +all: $(LIBRARIES) #--------------------------------------------------------------------------------- $(BBALIB).a: $(LWIPOBJ) #--------------------------------------------------------------------------------- @@ -202,67 +349,8 @@ $(BTELIB).a: $(BTEOBJ) $(WIIUSELIB).a: $(WIIUSEOBJ) #--------------------------------------------------------------------------------- -.PHONY: libs wii cube install-headers install dist docs - -#--------------------------------------------------------------------------------- -install-headers: -#--------------------------------------------------------------------------------- - @mkdir -p $(INCDIR) - @mkdir -p $(INCDIR)/ogc/machine - @mkdir -p $(INCDIR)/bte - @mkdir -p $(INCDIR)/wiiuse - @mkdir -p $(INCDIR)/modplay - @mkdir -p $(INCDIR)/sdcard - @mkdir -p $(INCDIR)/di - @mkdir -p $(INCDIR)/wiikeyboard - @cp ./gc/*.h $(INCDIR) - @cp ./gc/ogc/*.h $(INCDIR)/ogc - @cp ./gc/ogc/machine/*.h $(INCDIR)/ogc/machine - @cp ./gc/bte/*.h $(INCDIR)/bte - @cp ./gc/wiiuse/*.h $(INCDIR)/wiiuse - @cp ./gc/modplay/*.h $(INCDIR)/modplay - @cp ./gc/sdcard/*.h $(INCDIR)/sdcard - @cp ./gc/di/*.h $(INCDIR)/di - @cp ./gc/wiikeyboard/*.h $(INCDIR)/wiikeyboard - -#--------------------------------------------------------------------------------- -install: wii cube install-headers -#--------------------------------------------------------------------------------- - @mkdir -p $(DEVKITPRO)/libogc - @cp -frv include $(DEVKITPRO)/libogc - @cp -frv lib $(DEVKITPRO)/libogc - @cp -frv libogc_license.txt $(DEVKITPRO)/libogc - - -#--------------------------------------------------------------------------------- -dist: wii cube install-headers -#--------------------------------------------------------------------------------- - @tar --exclude=*CVS* --exclude=.svn --exclude=wii --exclude=cube --exclude=*deps* \ - --exclude=*.bz2 --exclude=*include* --exclude=*lib/* --exclude=*docs/*\ - -cvjf libogc-src-$(VERSTRING).tar.bz2 * - @tar -cvjf libogc-$(VERSTRING).tar.bz2 include lib libogc_license.txt - - -LIBRARIES := $(OGCLIB).a $(DBLIB).a - -ifeq ($(PLATFORM),cube) -LIBRARIES += $(BBALIB).a -endif -ifeq ($(PLATFORM),wii) -LIBRARIES += $(BTELIB).a $(WIIUSELIB).a $(WIIKEYBLIB).a -endif - -#--------------------------------------------------------------------------------- -libs: $(LIBRARIES) -#--------------------------------------------------------------------------------- - #--------------------------------------------------------------------------------- clean: #--------------------------------------------------------------------------------- - rm -fr $(BASEDIR)/wii/*.o + rm -fr $(LWIPOBJ) $(OGCOBJ) $(DBOBJ) $(BTEOBJ) $(WIIUSEOBJ) $(WIIKEYBLIBOBJ) rm -f *.map - -#--------------------------------------------------------------------------------- -docs: install-headers -#--------------------------------------------------------------------------------- - doxygen libogc.dox diff --git a/wii/libogc/deps/empty.txt b/wii/libogc/deps/empty.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/wii/libogc/libs/wii/libbte.a b/wii/libogc/libs/wii/libbte.a index a3cfae914a44a9ef7c29ef7b2c622235157d3adc..73af7a1a25d29f8f39302d425315f00a3739d9b1 100644 GIT binary patch delta 134 zcmaF!Qs&J|nF(?%mgeTB8&-0t z94yujRJ#3~5vxi&h-(7Yxt(_xYpoHOzrF7b>k~hS6p$&tz1NyeH4Cm(Z2Os|YzqAV DOmHi1 delta 134 zcmaF!Qs&J|nF(?%7N&;g8&-0t z94yujRJ#3~5vxi&h-(Jcxt(_xYpoHOzrF7b>k~hS6p$&tz1NyeH4Cm(Z2Os|YzqAV DJ&`Lm diff --git a/wii/libogc/libs/wii/libdb.a b/wii/libogc/libs/wii/libdb.a index 34f72fc4c63a49a0d0f63c8d5d7fa196780e1ac6..632fe4058f619ae4b9713e6401ce14d11d319adf 100644 GIT binary patch delta 231 zcmZ4SUVg=U`3Z6?mgeTB8N0n?voD6@y@OEFy0)>`JLfiRxf_L?B(WA+Gc%p_(d0|a-*A?9m7ATHR( t?H&9qzrG;2b68lH9Yb(qPP2-gL+I_9$+nFZNp?OP*DVCMp^{yr4glmONGkvU delta 231 zcmZ4SUVg=U`3Z6?7N&;g8N0n?vou-ff;JxpJU;fl7_GCvK3@x->*1Ti18M{r{%F)JB>wSlbIKI0Jc wH6H}GgP-Ns7X)_>3+u9D2yV=2Rh5-L1fWyzn^z^4~P5vob&yj-#x$c_34b_ zD~>*MLUB=%d(39^;e)3*7`d%Nj~aaU?o%`ebO<;`F`r5pzGo`d_ih~P6`wy)70w#O zWnKx(yz06&mO~IaqSDt=Ic{8fcf)xgq4y0{k^cR9bxRs8{mWJx%jnVEr0()kl~>8I z@Fb#6KTS(>2F=@Dw1ia%9#?Dboy1(^3KA9~n)!Mv#n#>=D#d?^U{%MM7%KJ6=CF{T z!L(nBvpybRPWh>RpVh=diBg-Zj;jldHsu7ZN2i8xi#AI|>f)qd3zPoDiKkRf%6*Qc zm%n8e{kCNA+jNm8k^?;cZh@A`-?XjkT!EMz!SjnL3l)^jLq--NuTnCSRd~?gr6Vd< z{5Y3_BNaZ*rMdYHS@b=ef76;1H#oY$VNLoDy%Hou&8=VZ%UlMbZm5j2g}yqm1Wd;fn_8N-5*zu#i-NZh7MLQv%}JY5OV* zE3T~|9MLa_BMa76w%8}++Y5(`<*jkv1Gb4C zb|lt>olq0z&mAWz1zt8R{o#vm#S~C@W2f&)48;d^E_hH^@X#$Agx-SpsWP4k7M#8O EAKBQ0SpWb4 delta 1214 zcmYk4T}YE*6vx^3)NOw6c{knWrn8lEx!P8iVkjY*jaU{!B5DyDOH!nqNNS^AZ=!jj z(Aj}?HhRM`4~L1tKAvZyH$o740naS29So#>(y*G593ltvB- z_@NX(+0P+@NQF3f4r6;r{OJ_N^L$BbJck5q$RrvGhX_n*k}EwJBmI&KZVm}32WNfhMV1z+$fzk#lY-%(>%6Ca}Y2ihuPdhNRn&0B(aUR2K_@%_}o_Fkar4 z?elU-z_Tv-=Q0ivjJ=jC6Ii4NF3!p+DPVCn(P6r1ehv?HzutSBA*2 zH;Ga*r4&l3l+qyVP1hfeHHKf$(?^zfbO1=(Q4XFIV&C z4rf-uwU?TLJ`NGgxU`N<4yk`#t~=UI@4@D8uE`_Fj%giqOlJ)~;4BEtE&A`#UqMeZ zdGx=PT$TX4Pk-Y!hY03$hWY4y)8;9s!CAq!Ur*;LN%N2a%tP6h0wxBvZ?kRJ+4QVZ zOhD*(PMeKoZJh`~ad*zQ)2vlHpR>>yOQ|5W#8~EJ*~ym>(0a?5)kL$MJxFNF2%)Xq z%>e6Rrce5J!KB|5Ji_{h^?53?Yr#ZmH*_uR$vDP%fr`IB#8^n`PN2EQZ0cvbP^g0O z4fD8(WoDB->iqf!mgy<5-I?#mX3G7{)XG3UR0b>^XW1D2(O~(nrSLAppdH-X_LN>a cSo@f(0LEO_$Mzj|Pp|chVh3OHTd&^y5BKAmoB#j- diff --git a/wii/libogc/libs/wii/libwiikeyboard.a b/wii/libogc/libs/wii/libwiikeyboard.a index 449c76294a6c9ef6aff147771a29eff8d453aca5..7a038b88f0e944efc0f4a7a952bae4694796a772 100644 GIT binary patch delta 59 zcmZphz|l5=V}cxurMbE3MkOvLFk`a;lT0&&70_yP1NEf;A35v* delta 169 zcmX@JRr1VM$q8~S7N&+48d@y5TG?+JC?k1!7=G-Ha zvk~0w3*#9pE5ZEjKxvse2-7Z{DdjSl2{b}t`#vq^H*pY|b)C!w>tQnD+bu0wI#Xd> ZvGzOjShnAp$Ep