Merge pull request #1 from uppfinnarn/master

Fixing OSLib not building with a modern toolchain
dogo · Oct 21, 2013 · f0d1abf · f0d1abf
2 parents 355a551 + 9d6c995
commit f0d1abf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
-
+*.o
 .DS_Store
diff --git a/Makefile b/Makefile
@@ -14,7 +14,7 @@
 
 #PATH 		:= /c/devkitPro/devkitPSP/bin:$(PATH)
 
-STATICLIB = libosl.a
+TARGET_LIB = libosl.a
 TARGET := OSLib
 PSP_FW_VERSION=371
 
@@ -174,11 +174,12 @@ SDK_LIBS :=					-lpspsdk \
 							-lpsprtc \
 							-lpspgu -lpspgum \
 							-lpspaudiolib \
-							-lpspaudio \
+							-lpspaudio -lpspaudiocodec \
 							-lpsppower \
 							-lpspusb -lpspusbstor \
                             -lpsputility \
-                            -lpspssl -lpsphttp -lpspwlan
+                            -lpspssl -lpsphttp -lpspwlan \
+                            -lpspnet_adhoc -lpspnet_adhocctl -lpspnet_adhocmatching
 
 EXTERN_LIBS :=				-lpng -ljpeg \
 							-lz

diff --git a/libosl.a b/libosl.a