Skip to content

Commit

Permalink
Update VPK resources, get building properly with NDEBUG on MinSizeRel
Browse files Browse the repository at this point in the history
  • Loading branch information
suicvne committed Sep 19, 2021
1 parent 6f63fa6 commit 8cdf7e4
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 7 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ endif()

# Build VPK
if(VITA)
vita_create_self(${VITA_EXE_NAME}.self ./SpaceCadetPinball)
vita_create_self(${VITA_EXE_NAME}.self ./SpaceCadetPinball SAFE)
vita_create_vpk(${VITA_EXE_NAME}.vpk ${VITA_TITLEID} ${VITA_EXE_NAME}.self
VERSION ${VITA_VERSION}
NAME ${VITA_APP_NAME}
Expand Down
6 changes: 6 additions & 0 deletions SpaceCadetPinball/high_score.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,19 @@ static void _Vita_ShowIME()
{
if(_HasInit == false)
{
#ifndef NDEBUG
debugNetPrintf(DEBUG, "Starting text input.\n");
#endif
SDL_StartTextInput();
_HasInit = true;
}
}

void high_score::vita_done_input()
{
#ifndef NDEBUG
debugNetPrintf(DEBUG, "vita_done_input\n");
#endif
SDL_StopTextInput();
_JustGotWord = true;
}
Expand Down Expand Up @@ -234,7 +238,9 @@ void high_score::RenderHighScoreDialog()
}
else
{
#ifndef NDEBUG
debugNetPrintf(DEBUG, "Please capture keyboard for %u. Last: %u; Equal: %d\n", active, last, active == last);
#endif
#ifdef VITA
_Vita_ShowIME();
#endif
Expand Down
7 changes: 3 additions & 4 deletions SpaceCadetPinball/winmain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,11 @@ int winmain::WinMain(LPCSTR lpCmdLine)
DatFileName = options::get_string("Pinball Data", pinball::get_rc_string(168, 0));

#if VITA
#ifndef NDEBUG
std::string dataFullPath = BasePath + DatFileName;
debugNetInit(DEBUG_IP, DEBUG_PORT, DEBUG);
debugNetPrintf(INFO, "The data path is '%s'\n", dataFullPath.c_str());
#endif

vita_init_joystick();
#endif
Expand Down Expand Up @@ -675,9 +677,6 @@ int winmain::event_handler(const SDL_Event* event)
pb::keyup(event->key.keysym.sym);
break;
case SDL_KEYDOWN:
#ifdef VITA
debugNetPrintf(DEBUG, "keysym: %d\n", event->key.keysym.sym);
#endif
if (!event->key.repeat)
pb::keydown(event->key.keysym.sym);
switch (event->key.keysym.sym)
Expand Down Expand Up @@ -827,7 +826,7 @@ int winmain::event_handler(const SDL_Event* event)
}
break;
default:
#ifdef VITA
#if defined(VITA) && !defined(NDEBUG)
if(event->type != 1536 && event->type != 1619 && event->type != 1616)
debugNetPrintf(DEBUG, "Default Event Type: %d\n", event->type);
#endif
Expand Down
Binary file modified resources/vita/sce_sys/icon0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/vita/sce_sys/livearea/contents/bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/vita/sce_sys/livearea/contents/startup.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions resources/vita/sce_sys/livearea/contents/template.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>

<livearea style="a1" format-ver="01.00" content-rev="1">
<livearea style="a5" format-ver="01.00" content-rev="1">
<livearea-background>
<image>bg.png</image>
</livearea-background>
Expand All @@ -9,7 +9,7 @@
<startup-image>startup.png</startup-image>
</gate>

<frame id="frame1">
<frame id="frame7">
<liveitem>
<text>
<str size="20" color="#ffffff" shadow="on">Ported by Axiom</str>
Expand Down

0 comments on commit 8cdf7e4

Please sign in to comment.