Skip to content

Commit

Permalink
Removed stripping as it's now a part of CreatePBP macro; Removed unus…
Browse files Browse the repository at this point in the history
…ed libraries from linker call; Moved PSP SDK libraries to be the last in linker invocation
  • Loading branch information
dbeef committed Apr 24, 2024
1 parent f91456e commit ba83aa3
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 39 deletions.
23 changes: 23 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,29 @@ target_link_libraries(Spelunky_PSP PRIVATE
Dependencies
)

target_link_libraries(Spelunky_PSP PRIVATE
-L${PSPDEV}/psp/sdk/lib
-L${PSPDEV}/psp
-lGL
-lmodplug
-lvorbisenc
-lvorbisfile
-lvorbis
-logg
-lpspirkeyb
-lpsppower_driver
-lpsppower
-lpspdebug
-lpspgu
-lpspvram
-lpspvfpu
-lpspctrl
-lpspge
-lpspdisplay
-lpsphprm
-lpspaudio
)

set_target_properties(Spelunky_PSP
PROPERTIES
CXX_STANDARD
Expand Down
40 changes: 1 addition & 39 deletions cmake/DependenciesPSP.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,38 +8,7 @@ macro(add_psp_dependencies)
)

add_library(Dependencies INTERFACE)
target_link_libraries(Dependencies INTERFACE
-L${PSPDEV}/psp/lib
-lg
-lstdc++
-lc
-lGLU
-lglut
-lz
-lm
-lGL
-lvorbisidec
-lmikmod
-lpspvfpu
-L${PSPDEV}/psp/sdk/lib
-L${PSPDEV}/psp
-lpspdebug
-lpspgu
-lpspctrl
-lpspge
-lpspirkeyb
-lpsppower
-lpsppower_driver
-lpspdisplay
-lpsphprm
-lpspsdk
-lpsprtc
-lpspaudio
-lpsputility
-lpspnet_inet
-lc
-lpspuser
)
target_link_libraries(Dependencies INTERFACE)

target_compile_definitions(Dependencies INTERFACE
SPELUNKY_PSP_PLATFORM_PSP
Expand All @@ -49,13 +18,6 @@ macro(add_psp_dependencies)
endmacro()

macro(spelunky_psp_post_build_psp)
add_custom_command(
TARGET Spelunky_PSP
POST_BUILD COMMAND
"psp-strip" "$<TARGET_FILE:Spelunky_PSP>"
COMMENT "Stripping binary"
)

create_pbp_file(TARGET Spelunky_PSP
ICON_PATH ${ASSETS_PATH}/metadata/icon.png
BACKGROUND_PATH ${ASSETS_PATH}/metadata/background.png
Expand Down

0 comments on commit ba83aa3

Please sign in to comment.