dc
This commit is contained in:
parent
dd5240e9cd
commit
6740fb6c86
6 changed files with 456 additions and 334 deletions
|
|
@ -9,6 +9,11 @@ if(PS2)
|
|||
set(CMAKE_EXECUTABLE_SUFFIX .elf)
|
||||
elseif(VITA)
|
||||
set(GL vitaGL)
|
||||
elseif(PLATFORM_DREAMCAST)
|
||||
include(kallistios)
|
||||
add_compile_definitions(USE_KALLISTIOS)
|
||||
add_compile_definitions(NO_FCNTL)
|
||||
set(GL GL)
|
||||
else()
|
||||
find_package(OpenGL REQUIRED)
|
||||
|
||||
|
|
@ -16,7 +21,10 @@ else()
|
|||
endif()
|
||||
|
||||
set(MILSKO "/usr/local")
|
||||
if(NOT PLATFORM_DREAMCAST)
|
||||
option(TRY_SDL2 "Try SDL2" ON)
|
||||
option(TRY_MILSKO "Try SDL2" OFF)
|
||||
endif()
|
||||
|
||||
add_executable(gquake ${SOURCES})
|
||||
target_include_directories(gquake PRIVATE include)
|
||||
|
|
@ -64,9 +72,15 @@ if(NOT FOUND AND TRY_SDL2)
|
|||
set(FOUND ON)
|
||||
endif()
|
||||
|
||||
if(NOT FOUND)
|
||||
if(NOT FOUND AND TRY_MILSKO)
|
||||
target_compile_definitions(gquake PRIVATE USE_MILSKO USE_MINIAUDIO)
|
||||
target_include_directories(gquake PRIVATE ${MILSKO}/include)
|
||||
target_link_directories(gquake PRIVATE ${MILSKO}/src ${MILSKO}/lib)
|
||||
target_link_libraries(gquake PRIVATE Mw)
|
||||
endif()
|
||||
|
||||
if(PLATFORM_DREAMCAST)
|
||||
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/romdisk/)
|
||||
file(COPY ${CMAKE_BINARY_DIR}/../id1 DESTINATION ${CMAKE_BINARY_DIR}/romdisk/)
|
||||
kos_add_romdisk(${PROJECT_NAME} ${CMAKE_BINARY_DIR}/romdisk/)
|
||||
endif()
|
||||
|
|
|
|||
3
compile_flags.txt
Normal file
3
compile_flags.txt
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
-DUSE_KALLISTIOS
|
||||
-I/opt/toolchains/dc/kos-ports/include/
|
||||
-I/opt/toolchains/dc/kos/include/
|
||||
|
|
@ -1774,8 +1774,11 @@ void COM_InitFilesystem (void)
|
|||
//
|
||||
// start up with GAMENAME by default (id1)
|
||||
//
|
||||
#ifdef USE_KALLISTIOS
|
||||
COM_AddGameDirectory ("/rd/");
|
||||
#else
|
||||
COM_AddGameDirectory (va("%s/"GAMENAME, basedir) );
|
||||
|
||||
#endif
|
||||
if (COM_CheckParm ("-rogue"))
|
||||
COM_AddGameDirectory (va("%s/rogue", basedir) );
|
||||
if (COM_CheckParm ("-hipnotic"))
|
||||
|
|
@ -1823,5 +1826,3 @@ void COM_InitFilesystem (void)
|
|||
if (COM_CheckParm ("-proghack"))
|
||||
proghack = qtrue;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -81,6 +81,8 @@ int UDP_Init (void)
|
|||
// determine my name & address
|
||||
#ifdef _EE
|
||||
strcpy(buff, "PS2");
|
||||
#elif USE_KALLISTIOS
|
||||
strcpy(buff, "DC");
|
||||
#else
|
||||
gethostname(buff, MAXHOSTNAMELEN);
|
||||
#endif
|
||||
|
|
@ -157,7 +159,7 @@ int UDP_OpenSocket (int port)
|
|||
if (ioctl (newsocket, FIONBIO, (u_long*)&_qtrue) == -1)
|
||||
#elif defined(_PSP) || defined(__vita__)
|
||||
if(setsockopt(newsocket, SOL_SOCKET, SO_NONBLOCK, (char*)_qtrue, sizeof(_qtrue)) == -1)
|
||||
#elif defined(_EE)
|
||||
#elif defined(_EE) || defined(USE_KALLISTIOS)
|
||||
#else
|
||||
if (ioctl (newsocket, FIONBIO, (char *)&_qtrue) == -1)
|
||||
#endif
|
||||
|
|
@ -259,7 +261,7 @@ int UDP_CheckNewConnections (void)
|
|||
if (net_acceptsocket == -1)
|
||||
return -1;
|
||||
|
||||
#if defined(_PSP) || defined(_EE) || defined(__vita__)
|
||||
#if defined(_PSP) || defined(_EE) || defined(__vita__) || defined(USE_KALLISTIOS)
|
||||
#else
|
||||
if (ioctl (net_acceptsocket, FIONREAD, &available) == -1)
|
||||
Sys_Error ("UDP: ioctlsocket (FIONREAD) failed\n");
|
||||
|
|
@ -379,6 +381,10 @@ int UDP_GetNameFromAddr (struct qsockaddr *addr, char *name)
|
|||
{
|
||||
struct hostent *hostentry;
|
||||
|
||||
#ifdef USE_KALLISTIOS
|
||||
printf("UDP_GetNameFromAddr STUB");
|
||||
#else
|
||||
|
||||
hostentry = gethostbyaddr ((char *)&((struct sockaddr_in *)addr)->sin_addr, sizeof(struct in_addr), AF_INET);
|
||||
if (hostentry)
|
||||
{
|
||||
|
|
@ -387,6 +393,7 @@ int UDP_GetNameFromAddr (struct qsockaddr *addr, char *name)
|
|||
}
|
||||
|
||||
Q_strcpy (name, UDP_AddrToString (addr));
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
181
src/port.c
181
src/port.c
|
|
@ -5,30 +5,47 @@ static MwWidget win = NULL;
|
|||
static MwWidget opengl;
|
||||
|
||||
static int MilskoToQuakeKey(int key) {
|
||||
if(key == MwKEY_ENTER) key = K_ENTER;
|
||||
if(key == MwKEY_ESCAPE) key = K_ESCAPE;
|
||||
if(key == MwKEY_BACKSPACE) key = K_BACKSPACE;
|
||||
if(key == MwKEY_LEFT) key = K_LEFTARROW;
|
||||
if(key == MwKEY_RIGHT) key = K_RIGHTARROW;
|
||||
if(key == MwKEY_UP) key = K_UPARROW;
|
||||
if(key == MwKEY_DOWN) key = K_DOWNARROW;
|
||||
if(key == MwKEY_LEFTSHIFT) key = K_SHIFT;
|
||||
if(key == MwKEY_RIGHTSHIFT) key = K_SHIFT;
|
||||
if(key == MwKEY_ALT) key = K_ALT;
|
||||
if(key == MwKEY_CONTROL) key = K_CTRL;
|
||||
if (key == MwKEY_ENTER)
|
||||
key = K_ENTER;
|
||||
if (key == MwKEY_ESCAPE)
|
||||
key = K_ESCAPE;
|
||||
if (key == MwKEY_BACKSPACE)
|
||||
key = K_BACKSPACE;
|
||||
if (key == MwKEY_LEFT)
|
||||
key = K_LEFTARROW;
|
||||
if (key == MwKEY_RIGHT)
|
||||
key = K_RIGHTARROW;
|
||||
if (key == MwKEY_UP)
|
||||
key = K_UPARROW;
|
||||
if (key == MwKEY_DOWN)
|
||||
key = K_DOWNARROW;
|
||||
if (key == MwKEY_LEFTSHIFT)
|
||||
key = K_SHIFT;
|
||||
if (key == MwKEY_RIGHTSHIFT)
|
||||
key = K_SHIFT;
|
||||
if (key == MwKEY_ALT)
|
||||
key = K_ALT;
|
||||
if (key == MwKEY_CONTROL)
|
||||
key = K_CTRL;
|
||||
|
||||
if('A' <= key && key <= 'Z') return tolower(key);
|
||||
if ('A' <= key && key <= 'Z')
|
||||
return tolower(key);
|
||||
|
||||
return key;
|
||||
}
|
||||
|
||||
static int MilskoToQuakeMouse(int btn) {
|
||||
int b = 0;
|
||||
if(btn == MwMOUSE_LEFT) b = 0;
|
||||
if(btn == MwMOUSE_MIDDLE) b = 2;
|
||||
if(btn == MwMOUSE_RIGHT) b = 1;
|
||||
if(btn == MwMOUSE_WHEELUP) return K_MWHEELUP;
|
||||
if(btn == MwMOUSE_WHEELDOWN) return K_MWHEELDOWN;
|
||||
if (btn == MwMOUSE_LEFT)
|
||||
b = 0;
|
||||
if (btn == MwMOUSE_MIDDLE)
|
||||
b = 2;
|
||||
if (btn == MwMOUSE_RIGHT)
|
||||
b = 1;
|
||||
if (btn == MwMOUSE_WHEELUP)
|
||||
return K_MWHEELUP;
|
||||
if (btn == MwMOUSE_WHEELDOWN)
|
||||
return K_MWHEELDOWN;
|
||||
|
||||
return K_MOUSE1 + b;
|
||||
}
|
||||
|
|
@ -47,16 +64,20 @@ static void MWAPI mousemove(MwWidget handle, void* user, void* call) {
|
|||
static void MWAPI key(MwWidget handle, void *user, void *call) {
|
||||
int k = *(int *)call;
|
||||
k = MilskoToQuakeKey(k);
|
||||
if(k == -0xdead) return;
|
||||
if(k & MwKEY_FLAG) return;
|
||||
if (k == -0xdead)
|
||||
return;
|
||||
if (k & MwKEY_FLAG)
|
||||
return;
|
||||
Key_Event(k, 1);
|
||||
}
|
||||
|
||||
static void MWAPI keyrelease(MwWidget handle, void *user, void *call) {
|
||||
int k = *(int *)call;
|
||||
k = MilskoToQuakeKey(k);
|
||||
if(k == -0xdead) return;
|
||||
if(k & MwKEY_FLAG) return;
|
||||
if (k == -0xdead)
|
||||
return;
|
||||
if (k & MwKEY_FLAG)
|
||||
return;
|
||||
Key_Event(k, 0);
|
||||
}
|
||||
|
||||
|
|
@ -81,26 +102,21 @@ static void MWAPI focusout(MwWidget handle, void* user, void* call){
|
|||
MwGrabPointer(opengl, 0);
|
||||
}
|
||||
|
||||
|
||||
void Port_Init(int width, int height) {
|
||||
MwSizeHints sh;
|
||||
MwWidget label;
|
||||
|
||||
MwLibraryInit();
|
||||
|
||||
win = MwVaCreateWidget(MwWindowClass, "Quake", NULL, MwDEFAULT, MwDEFAULT, width, height + 24,
|
||||
MwNtitle, "Quake",
|
||||
NULL);
|
||||
win = MwVaCreateWidget(MwWindowClass, "Quake", NULL, MwDEFAULT, MwDEFAULT,
|
||||
width, height + 24, MwNtitle, "Quake", NULL);
|
||||
label = MwVaCreateWidget(MwLabelClass, "Label", win, 0, height, width, 24,
|
||||
MwNtext, "Milsko Quake!",
|
||||
NULL);
|
||||
MwNtext, "Milsko Quake!", NULL);
|
||||
opengl = MwCreateWidget(MwOpenGLClass, "OpenGL", win, 0, 0, width, height);
|
||||
|
||||
sh.min_width = sh.max_width = width;
|
||||
sh.min_height = sh.max_height = height + 24;
|
||||
MwVaApply(win,
|
||||
MwNsizeHints, &sh,
|
||||
NULL);
|
||||
MwVaApply(win, MwNsizeHints, &sh, NULL);
|
||||
|
||||
MwOpenGLMakeCurrent(opengl);
|
||||
|
||||
|
|
@ -118,13 +134,16 @@ void Port_Init(int width, int height){
|
|||
}
|
||||
|
||||
void Port_Step(void) {
|
||||
if(!win) return;
|
||||
if (!win)
|
||||
return;
|
||||
|
||||
if(MwPending(win)) MwStep(win);
|
||||
if (MwPending(win))
|
||||
MwStep(win);
|
||||
}
|
||||
|
||||
void Port_GrabPointer(int toggle) {
|
||||
if(!win) return;
|
||||
if (!win)
|
||||
return;
|
||||
|
||||
if (toggle) {
|
||||
MwHideCursor(opengl);
|
||||
|
|
@ -141,9 +160,7 @@ void Port_Shutdown(void){
|
|||
win = NULL;
|
||||
}
|
||||
|
||||
void Port_SwapBuffer(void){
|
||||
MwOpenGLSwapBuffer(opengl);
|
||||
}
|
||||
void Port_SwapBuffer(void) { MwOpenGLSwapBuffer(opengl); }
|
||||
#endif
|
||||
|
||||
#ifdef USE_SDL2
|
||||
|
|
@ -155,12 +172,15 @@ void Port_Init(int width, int height){
|
|||
|
||||
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
|
||||
|
||||
win = SDL_CreateWindow("Quake", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, width, height, SDL_WINDOW_OPENGL);
|
||||
win =
|
||||
SDL_CreateWindow("Quake", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
|
||||
width, height, SDL_WINDOW_OPENGL);
|
||||
context = SDL_GL_CreateContext(win);
|
||||
}
|
||||
|
||||
void Port_Step(void) {
|
||||
if(!win) return;
|
||||
if (!win)
|
||||
return;
|
||||
|
||||
SDL_Event ev;
|
||||
|
||||
|
|
@ -174,9 +194,12 @@ void Port_Step(void){
|
|||
int b = 0;
|
||||
int btn = ev.button.button;
|
||||
|
||||
if(btn == SDL_BUTTON_LEFT) b = 0;
|
||||
if(btn == SDL_BUTTON_MIDDLE) b = 2;
|
||||
if(btn == SDL_BUTTON_RIGHT) b = 1;
|
||||
if (btn == SDL_BUTTON_LEFT)
|
||||
b = 0;
|
||||
if (btn == SDL_BUTTON_MIDDLE)
|
||||
b = 2;
|
||||
if (btn == SDL_BUTTON_RIGHT)
|
||||
b = 1;
|
||||
|
||||
Key_Event(K_MOUSE1 + b, ev.type == SDL_MOUSEBUTTONDOWN);
|
||||
} else if (ev.type == SDL_MOUSEWHEEL) {
|
||||
|
|
@ -192,23 +215,40 @@ void Port_Step(void){
|
|||
} else if (ev.type == SDL_KEYDOWN || ev.type == SDL_KEYUP) {
|
||||
int key = ev.key.keysym.sym;
|
||||
|
||||
if(key == SDLK_RETURN) key = K_ENTER;
|
||||
if(key == SDLK_ESCAPE) key = K_ESCAPE;
|
||||
if(key == SDLK_BACKSPACE) key = K_BACKSPACE;
|
||||
if(key == SDLK_LEFT) key = K_LEFTARROW;
|
||||
if(key == SDLK_RIGHT) key = K_RIGHTARROW;
|
||||
if(key == SDLK_UP) key = K_UPARROW;
|
||||
if(key == SDLK_DOWN) key = K_DOWNARROW;
|
||||
if(key == SDLK_LSHIFT) key = K_SHIFT;
|
||||
if(key == SDLK_RSHIFT) key = K_SHIFT;
|
||||
if(key == SDLK_LALT) key = K_ALT;
|
||||
if(key == SDLK_RALT) key = K_ALT;
|
||||
if(key == SDLK_LCTRL) key = K_CTRL;
|
||||
if(key == SDLK_RCTRL) key = K_CTRL;
|
||||
if(key == SDLK_LGUI) key = K_SUPER;
|
||||
if(key == SDLK_RGUI) key = K_SUPER;
|
||||
if(SDLK_a <= key && key <= SDLK_z) key = key - SDLK_a + 'a';
|
||||
if(SDLK_0 <= key && key <= SDLK_9) key = key - SDLK_0 + '0';
|
||||
if (key == SDLK_RETURN)
|
||||
key = K_ENTER;
|
||||
if (key == SDLK_ESCAPE)
|
||||
key = K_ESCAPE;
|
||||
if (key == SDLK_BACKSPACE)
|
||||
key = K_BACKSPACE;
|
||||
if (key == SDLK_LEFT)
|
||||
key = K_LEFTARROW;
|
||||
if (key == SDLK_RIGHT)
|
||||
key = K_RIGHTARROW;
|
||||
if (key == SDLK_UP)
|
||||
key = K_UPARROW;
|
||||
if (key == SDLK_DOWN)
|
||||
key = K_DOWNARROW;
|
||||
if (key == SDLK_LSHIFT)
|
||||
key = K_SHIFT;
|
||||
if (key == SDLK_RSHIFT)
|
||||
key = K_SHIFT;
|
||||
if (key == SDLK_LALT)
|
||||
key = K_ALT;
|
||||
if (key == SDLK_RALT)
|
||||
key = K_ALT;
|
||||
if (key == SDLK_LCTRL)
|
||||
key = K_CTRL;
|
||||
if (key == SDLK_RCTRL)
|
||||
key = K_CTRL;
|
||||
if (key == SDLK_LGUI)
|
||||
key = K_SUPER;
|
||||
if (key == SDLK_RGUI)
|
||||
key = K_SUPER;
|
||||
if (SDLK_a <= key && key <= SDLK_z)
|
||||
key = key - SDLK_a + 'a';
|
||||
if (SDLK_0 <= key && key <= SDLK_9)
|
||||
key = key - SDLK_0 + '0';
|
||||
|
||||
Key_Event(key, ev.type == SDL_KEYDOWN);
|
||||
}
|
||||
|
|
@ -228,12 +268,31 @@ void Port_GrabPointer(int toggle){
|
|||
}
|
||||
}
|
||||
|
||||
void Port_Shutdown(void) { SDL_Quit(); }
|
||||
|
||||
void Port_Shutdown(void){
|
||||
SDL_Quit();
|
||||
void Port_SwapBuffer(void) { SDL_GL_SwapWindow(win); }
|
||||
#endif
|
||||
|
||||
#ifdef USE_KALLISTIOS
|
||||
#include <kos.h>
|
||||
KOS_INIT_FLAGS(INIT_DEFAULT);
|
||||
|
||||
#include <GL/glkos.h>
|
||||
#include <stdio.h>
|
||||
|
||||
void Port_Init(int width, int height) {
|
||||
glKosInit();
|
||||
}
|
||||
|
||||
void Port_Step(void) {
|
||||
}
|
||||
|
||||
void Port_GrabPointer(int toggle) {}
|
||||
|
||||
void Port_Shutdown(void) {}
|
||||
|
||||
void Port_SwapBuffer(void) {
|
||||
SDL_GL_SwapWindow(win);
|
||||
glKosSwapBuffers();
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
|||
38
src/snd_dc.c
Normal file
38
src/snd_dc.c
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
/*
|
||||
Copyright (C) 1996-1997 Id Software, Inc.
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
as published by the Free Software Foundation; either version 2
|
||||
of the License, or (at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
|
||||
See the GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
*/
|
||||
#ifdef USE_KALLISTIOS
|
||||
#include "quakedef.h"
|
||||
|
||||
int snd_inited;
|
||||
|
||||
int total = 0;
|
||||
#define BUFFER_SIZE 4096 * 4
|
||||
unsigned char dma_buffer[BUFFER_SIZE];
|
||||
|
||||
qboolean SNDDMA_Init(void) { return 1; }
|
||||
|
||||
int SNDDMA_GetDMAPos(void) { return 0; }
|
||||
|
||||
int SNDDMA_GetSamples(void) { return total; }
|
||||
|
||||
void SNDDMA_Shutdown(void) {}
|
||||
|
||||
void SNDDMA_Submit(void) {}
|
||||
#endif
|
||||
Loading…
Add table
Add a link
Reference in a new issue