Skip to content
Snippets Groups Projects
Commit e1b87665 authored by Jeremy Soller's avatar Jeremy Soller
Browse files

Merge branch 'sdl-flip' into 'master'

Fix SDL_Flip, fix syobonaction recipe

See merge request redox-os/cookbook!194
parents 30eaa01b e39d5002
No related branches found
No related tags found
1 merge request!194Fix SDL_Flip, fix syobonaction recipe
diff -rupNw source-original/src/io/gfx/video.cpp source/src/io/gfx/video.cpp
--- source-original/src/io/gfx/video.cpp 2018-12-03 01:26:03.479047234 +0100
+++ source/src/io/gfx/video.cpp 2018-12-02 21:50:10.650021649 +0100
@@ -516,7 +516,7 @@ void Video::flip (int mspf, PaletteEffec
}
// Show what has been drawn
- SDL_Flip(screen);
+ SDL_UpdateRect(screen, 0, 0, screen->w, screen->h);
return;
......@@ -10,15 +10,3 @@ diff -burpN source-original/configure.ac source/configure.ac
AC_DECL_SYS_SIGLIST
AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS(unistd.h asm/byteorder.h sched.h)
diff -burpN source-original/src/SDL/i_video.c source/src/SDL/i_video.c
--- source-original/src/SDL/i_video.c 2008-10-18 15:32:29.000000000 +0200
+++ source/src/SDL/i_video.c 2018-04-23 00:51:18.944949507 +0200
@@ -407,7 +407,7 @@ void I_FinishUpdate (void)
I_UploadNewPalette(newpal);
newpal = NO_PALETTE_CHANGE;
}
- SDL_Flip(screen);
+ SDL_UpdateRect(screen, 0, 0, screen->w, screen->h);
}
//
......@@ -564,7 +564,7 @@ diff -rupNw source-original/src/video/orbital/SDL_orbitalvideo.c source/src/vide
+ }
+
+ /* Set up the new mode framebuffer */
+ current->flags = flags /*& SDL_FULLSCREEN*/;
+ current->flags = flags & (~SDL_DOUBLEBUF);
+ current->w = width;
+ current->h = height;
+ current->pitch = width * (bpp / 8);
......
......@@ -10,18 +10,6 @@ diff -rupNw source-original/DxLib.cpp source/DxLib.cpp
NULL);
SDL_ShowCursor(SDL_DISABLE);
diff -rupNw source-original/DxLib.h source/DxLib.h
--- source-original/DxLib.h 2018-12-08 19:59:16.777579338 +0100
+++ source/DxLib.h 2018-12-08 01:26:50.763357641 +0100
@@ -18,7 +18,7 @@
#define FALSE 0
#define byte unsigned char
-#define ScreenFlip() SDL_Flip(screen)
+#define ScreenFlip() SDL_UpdateRect(screen, 0, 0, screen->w, screen->h)
#define GetNowCount() SDL_GetTicks()
//UNIMPLEMENTED - macro substitution
diff -rupNw source-original/main.cpp source/main.cpp
--- source-original/main.cpp 2018-12-08 19:59:16.781579399 +0100
+++ source/main.cpp 2018-12-08 18:11:33.716589712 +0100
......@@ -37,15 +25,6 @@ diff -rupNw source-original/main.cpp source/main.cpp
parseArgs(argc, argv);
if (DxLib_Init() == -1)
return 1;
@@ -4706,7 +4708,7 @@ void deinit()
setc0();
FillScreen();
DrawString(200, 200, "EXITING...", GetColor(255, 255, 255));
- SDL_Flip(screen);
+ SDL_UpdateRect(screen, 0, 0, screen->w, screen->h);
//SURFACES
for (t = 0; t < 51; t++)
diff -rupNw source-original/Makefile source/Makefile
--- source-original/Makefile 2018-12-08 19:59:16.777579338 +0100
+++ source/Makefile 2018-12-08 01:32:40.319685337 +0100
......@@ -55,10 +34,10 @@ diff -rupNw source-original/Makefile source/Makefile
+ ${CXX} ${LDFLAGS} main.o loadg.o DxLib.o -o SyobonAction `${SDL_CONFIG} --libs` -lSDL_gfx -lSDL_image -lSDL_mixer -lpng -ljpeg -lz -lSDL -lSDL_ttf -lfreetype
main.o:main.cpp
- gcc -c main.cpp
+ ${CXX} ${CPPFLAGS} -c main.cpp
+ ${CXX} ${CPPFLAGS} `${SDL_CONFIG} --cflags` -c main.cpp
loadg.o:loadg.cpp
- gcc -c loadg.cpp
+ ${CXX} ${CPPFLAGS} -c loadg.cpp
+ ${CXX} ${CPPFLAGS} `${SDL_CONFIG} --cflags` -c loadg.cpp
DxLib.o:DxLib.cpp
- gcc -c DxLib.cpp
+ ${CXX} ${CPPFLAGS} -c DxLib.cpp
+ ${CXX} ${CPPFLAGS} `${SDL_CONFIG} --cflags` -c DxLib.cpp
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment