Skip to content

Commit ebbf9ca

Browse files
committed
add libraries and fix nonstring/unused
1 parent 6ac4e89 commit ebbf9ca

5 files changed

Lines changed: 10 additions & 6 deletions

File tree

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ DEFINES := \
189189
# Compiler settings
190190
# -----------------
191191

192-
CFLAGS := $(DEFINES) -O2 -G0 -ggdb -Wall -DHAVE_AV_CONFIG_H -fno-strict-aliasing -fverbose-asm
192+
CFLAGS := $(DEFINES) -O2 -G0 -ggdb -Wall -Wno-unused -DHAVE_AV_CONFIG_H -fno-strict-aliasing -fverbose-asm
193193
CXXFLAGS := $(CFLAGS) -fno-exceptions -fno-rtti
194194
ASFLAGS := $(CFLAGS)
195195

‎cmake/IMG.cmake‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,14 @@ foreach(IMAGE_FORMAT ${OSL_IMAGE_FORMATS_AVAILABLE})
4545
if(${IMAGE_FORMAT} IN_LIST OSL_IMAGE_FORMAT_LOADERS)
4646
add_compile_definitions(-DOSL_IMAGE_LOADER_${IMAGE_FORMAT})
4747
include_directories(${${IMAGE_FORMAT}_INCLUDE_DIRS})
48+
link_directories(${${IMAGE_FORMAT}_LIBRARY_DIRS})
49+
link_libraries(${${IMAGE_FORMAT}_LIBRARIES})
4850
endif()
4951
if(${IMAGE_FORMAT} IN_LIST OSL_IMAGE_FORMAT_WRITERS)
5052
add_compile_definitions(-DOSL_IMAGE_WRITER_${IMAGE_FORMAT})
5153
include_directories(${${IMAGE_FORMAT}_INCLUDE_DIRS})
54+
link_directories(${${IMAGE_FORMAT}_LIBRARY_DIRS})
55+
link_libraries(${${IMAGE_FORMAT}_LIBRARIES})
5256
endif()
5357
else()
5458
list(REMOVE_ITEM OSL_IMAGE_FORMAT_WRITERS ${IMAGE_FORMAT})

‎samples/map/makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ ASFLAGS = $(CFLAGS)
1111
LIBDIR =
1212

1313
MYLIBS=
14-
STDLIBS= -losl -lpng -lz \
14+
STDLIBS= -lm -losl -lgif -lpng -ljpeg -lz \
1515
-lpsphprm -lpspsdk -lpspctrl -lpspumd -lpsprtc -lpsppower -lpspgu -lpspgum -lpspaudiolib -lpspaudio -lpsphttp -lpspssl -lpspwlan \
16-
-lpspnet_adhocmatching -lpspnet_adhoc -lpspnet_adhocctl -lm -ljpeg
16+
-lpspnet_adhocmatching -lpspnet_adhoc -lpspnet_adhocctl
1717
LIBS=$(STDLIBS) $(MYLIBS)
1818

1919
LDFLAGS =

‎samples/shapes/makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ ASFLAGS = $(CFLAGS)
1111
LIBDIR =
1212

1313
MYLIBS=
14-
STDLIBS= -losl -lpng -lz \
14+
STDLIBS= -lm -losl -lgif -lpng -ljpeg -lz \
1515
-lpsphprm -lpspsdk -lpspctrl -lpspumd -lpsprtc -lpsppower -lpspgu -lpspgum -lpspaudiolib -lpspaudio -lpsphttp -lpspssl -lpspwlan \
16-
-lpspnet_adhocmatching -lpspnet_adhoc -lpspnet_adhocctl -lm -ljpeg
16+
-lpspnet_adhocmatching -lpspnet_adhoc -lpspnet_adhocctl
1717
LIBS=$(STDLIBS) $(MYLIBS)
1818

1919
LDFLAGS =

‎src/saveload.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
SceUtilitySavedataParam savedata;
1212
PspUtilitySavedataListSaveNewData newData;
13-
char key[] = "QTAK319JQKJ952HA";
13+
__attribute__((nonstring)) char key[] = "QTAK319JQKJ952HA";
1414
int saveLoadType = OSL_DIALOG_NONE;
1515

1616
void oslInitSaveDialog(struct oslSaveLoad *saveData){

0 commit comments

Comments
 (0)