Skip to content

Commit

Permalink
Sync wiki -> header
Browse files Browse the repository at this point in the history
  • Loading branch information
icculus committed Oct 10, 2023
1 parent b7a0ef6 commit 32587bd
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion docs/README-android.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ done in the build directory for the app!
For more complex projects, follow these instructions:

1. Get the source code for SDL and copy the 'android-project' directory located at SDL/android-project to a suitable location. Also make sure to rename it to your project name (In these examples: YOURPROJECT).

(The 'android-project' directory can basically be seen as a sort of starting point for the android-port of your project. It contains the glue code between the Android Java 'frontend' and the SDL code 'backend'. It also contains some standard behaviour, like how events should be handled, which you will be able to change.)

2. Move or [symlink](https://en.wikipedia.org/wiki/Symbolic_link) the SDL directory into the "YOURPROJECT/app/jni" directory
Expand Down
4 changes: 2 additions & 2 deletions include/SDL_stdinc.h
Original file line number Diff line number Diff line change
Expand Up @@ -688,8 +688,8 @@ extern DECLSPEC size_t SDLCALL SDL_iconv(SDL_iconv_t cd, const char **inbuf,
size_t * outbytesleft);

/**
* This function converts a buffer or string between encodings in one pass, returning a
* string that must be freed with SDL_free() or NULL on error.
* This function converts a buffer or string between encodings in one pass,
* returning a string that must be freed with SDL_free() or NULL on error.
*
* \since This function is available since SDL 2.0.0.
*/
Expand Down
3 changes: 2 additions & 1 deletion include/SDL_system.h
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,8 @@ extern DECLSPEC int SDLCALL SDL_GDKGetTaskQueue(XTaskQueueHandle * outTaskQueue)
* This is effectively a synchronous version of XUserAddAsync, which always
* prefers the default user and allows a sign-in UI.
*
* \param outUserHandle a pointer to be filled in with the default user handle.
* \param outUserHandle a pointer to be filled in with the default user
* handle.
* \returns 0 if success, -1 if any error occurs.
*
* \since This function is available since SDL 2.28.0.
Expand Down
3 changes: 2 additions & 1 deletion include/SDL_video.h
Original file line number Diff line number Diff line change
Expand Up @@ -1278,7 +1278,8 @@ extern DECLSPEC int SDLCALL SDL_SetWindowFullscreen(SDL_Window * window,
/**
* Return whether the window has a surface associated with it.
*
* \returns SDL_TRUE if there is a surface associated with the window, or SDL_FALSE otherwise.
* \returns SDL_TRUE if there is a surface associated with the window, or
* SDL_FALSE otherwise.
*
* \since This function is available since SDL 2.28.0.
*
Expand Down

0 comments on commit 32587bd

Please sign in to comment.