From c9150497e3472e1057ed8286237fcf07106a075d Mon Sep 17 00:00:00 2001 From: Edoardo Prezioso Date: Wed, 7 Jan 2015 21:07:40 +0100 Subject: [PATCH] - Move sdlglvideo code from sdl to posix/sdl. Re-add sdlglvideo.cpp path in CMakeLists.txt . Warning: it won't compile yet. --- src/CMakeLists.txt | 6 ++---- src/{ => posix}/sdl/sdlglvideo.cpp | 0 src/{ => posix}/sdl/sdlglvideo.h | 0 3 files changed, 2 insertions(+), 4 deletions(-) rename src/{ => posix}/sdl/sdlglvideo.cpp (100%) rename src/{ => posix}/sdl/sdlglvideo.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4803006c2f..3edcbaf5da 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -584,13 +584,11 @@ set( PLAT_SDL_SOURCES posix/sdl/i_joystick.cpp posix/sdl/i_main.cpp posix/sdl/i_timer.cpp - posix/sdl/sdlvideo.cpp ) + posix/sdl/sdlvideo.cpp + posix/sdl/sdlglvideo.cpp ) set( PLAT_OSX_SOURCES posix/osx/iwadpicker_cocoa.mm posix/osx/zdoom.icns ) - -# Fixme: This must be adjusted to the new way of doing things: -# sdl/sdlglvideo.cpp set( PLAT_COCOA_SOURCES posix/cocoa/hid/HID_Config_Utilities.c posix/cocoa/hid/HID_Error_Handler.c diff --git a/src/sdl/sdlglvideo.cpp b/src/posix/sdl/sdlglvideo.cpp similarity index 100% rename from src/sdl/sdlglvideo.cpp rename to src/posix/sdl/sdlglvideo.cpp diff --git a/src/sdl/sdlglvideo.h b/src/posix/sdl/sdlglvideo.h similarity index 100% rename from src/sdl/sdlglvideo.h rename to src/posix/sdl/sdlglvideo.h