Skip to content

SDL.h to SDL2/SDL.h (compiles on SDL1 systems). #1384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Sondro wants to merge 5 commits into from
Closed

SDL.h to SDL2/SDL.h (compiles on SDL1 systems). #1384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0a6178b
SDL.h to SDL2/SDL.h (compiles on SDL1 systems).
Oct 31, 2022
004261d
Merge branch 'master' of https://github.com/Sondro/base
Oct 31, 2022
320f49d
Fix fullscreen infinite loop.
Oct 31, 2022
9d61355
Fix fullscreen infinite loop.
Oct 31, 2022
e70478c
Revert Makefile edits.
Oct 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ ifneq (,$(findstring msvc,$(PLATFORM)))
CC = clang
else
override CXX := $(TOOLSET_PREFIX)$(CXX)
override CC := $(TOOLSET_PREFIX)$(CC)
override CC := $(TOOLSET_PREFIX)$(CC)
endif

INCLUDES = -DVERSION_BUILD=$(PLATFORM_BUILD) \
Expand Down
19 changes: 12 additions & 7 deletions src/engine/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,13 +251,16 @@ void setupdisplay(bool dogl = true, bool msg = true)
SDL_GL_GetDrawableSize(screen, &renderw, &renderh);

int index = getdisplaymode();

if(windowfocus && SDL_GetWindowFlags(screen)&SDL_WINDOW_FULLSCREEN && (display.w != screenw || display.h != screenh))
{
scr_w = clamp(display.w, SCR_MINW, SCR_MAXW);
scr_h = clamp(display.h, SCR_MINH, SCR_MAXH);
resetfullscreen();
SDL_GetWindowSize(screen, &screenw, &screenh);
SDL_GL_GetDrawableSize(screen, &renderw, &renderh);
// FIX fullscreen loop:
SDL_MaximizeWindow(screen);
//scr_w = clamp(display.w, SCR_MINW, SCR_MAXW);
//scr_h = clamp(display.h, SCR_MINH, SCR_MAXH);
//resetfullscreen();
//SDL_GetWindowSize(screen, &screenw, &screenh);
//SDL_GL_GetDrawableSize(screen, &renderw, &renderh);
}
scr_w = screenw;
scr_h = screenh;
Expand All @@ -276,8 +279,10 @@ void setfullscreen(bool enable)
SDL_SetWindowFullscreen(screen, enable ? (fullscreendesktop ? SDL_WINDOW_FULLSCREEN_DESKTOP : SDL_WINDOW_FULLSCREEN) : 0);
if(!enable)
{
SDL_SetWindowSize(screen, scr_w, scr_h);
SDL_SetWindowPosition(screen, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED);
// FIX fullscreen loop:
if(SDL_GetWindowFlags(screen)&SDL_WINDOW_MAXIMIZED) { SDL_RestoreWindow(screen); }
//SDL_SetWindowSize(screen, scr_w, scr_h);
//SDL_SetWindowPosition(screen, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED);
}
wantdisplaysetup = true;
}
Expand Down
4 changes: 2 additions & 2 deletions src/shared/cube.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
#include <OpenGL/gl.h>
#define main SDL_main
#else
#include <SDL.h>
#include <SDL_opengl.h>
#include <SDL2/SDL.h>
#include <SDL2/SDL_opengl.h>
#endif
#endif

Expand Down