mirror of https://github.com/encounter/SDL.git
Changed C++ style comments to fix pedantic warnings.
This commit is contained in:
parent
0d196c3099
commit
ca11d7c8b5
|
@ -148,7 +148,7 @@ JNIEXPORT void JNICALL Java_org_libsdl_app_SDLActivity_onNativeResize(
|
|||
Android_SetScreenResolution(width, height, format);
|
||||
}
|
||||
|
||||
// Paddown
|
||||
/* Paddown */
|
||||
JNIEXPORT int JNICALL Java_org_libsdl_app_SDLActivity_onNativePadDown(
|
||||
JNIEnv* env, jclass jcls,
|
||||
jint device_id, jint keycode)
|
||||
|
@ -156,7 +156,7 @@ JNIEXPORT int JNICALL Java_org_libsdl_app_SDLActivity_onNativePadDown(
|
|||
return Android_OnPadDown(device_id, keycode);
|
||||
}
|
||||
|
||||
// Padup
|
||||
/* Padup */
|
||||
JNIEXPORT int JNICALL Java_org_libsdl_app_SDLActivity_onNativePadUp(
|
||||
JNIEnv* env, jclass jcls,
|
||||
jint device_id, jint keycode)
|
||||
|
|
|
@ -539,7 +539,7 @@ SDL_SetRelativeMouseMode(SDL_bool enabled)
|
|||
mouse->relative_mode_warp = SDL_TRUE;
|
||||
} else if (mouse->SetRelativeMouseMode(enabled) < 0) {
|
||||
if (enabled) {
|
||||
// Fall back to warp mode if native relative mode failed
|
||||
/* Fall back to warp mode if native relative mode failed */
|
||||
mouse->relative_mode_warp = SDL_TRUE;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -44,7 +44,7 @@ main(int argc, char *argv[])
|
|||
int consumed;
|
||||
|
||||
consumed = SDLTest_CommonArg(state, i);
|
||||
// needed vodoo to allow app to launch via OS X Finder
|
||||
/* needed voodoo to allow app to launch via OS X Finder */
|
||||
if (SDL_strncmp(argv[i], "-psn", 4)==0) {
|
||||
consumed = 1;
|
||||
}
|
||||
|
|
|
@ -210,7 +210,7 @@ process_shader(GLuint *shader, const char * source, GLint shader_type)
|
|||
GL_CHECK(ctx.glCompileShader(*shader));
|
||||
GL_CHECK(ctx.glGetShaderiv(*shader, GL_COMPILE_STATUS, &status));
|
||||
|
||||
// Dump debug info (source and log) if compilation failed.
|
||||
/* Dump debug info (source and log) if compilation failed. */
|
||||
if(status != GL_TRUE) {
|
||||
SDL_Log("Shader compilation failed");
|
||||
quit(-1);
|
||||
|
|
|
@ -53,7 +53,9 @@ main(int argc, char *argv[])
|
|||
exit(1);
|
||||
}
|
||||
|
||||
/*
|
||||
//SDL_CreateWindow("Dummy", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 128, 128, 0);
|
||||
*/
|
||||
|
||||
SDL_Log("There are %d joysticks at startup\n", SDL_NumJoysticks());
|
||||
if (enable_haptic)
|
||||
|
|
Loading…
Reference in New Issue