Commit 66b7d8b3 authored by Scott Duensing's avatar Scott Duensing

Adding JoeyLib logo to repo.

parent 7565c30b
......@@ -6,3 +6,8 @@ joeylib/src/music
joeylib/src/music.w
joeylib/src/*.dis
joeylib/src/*.map
build-*/
notes.txt
assets/JoeyLib Logo - 320x200.png
assets/JoeyLib Logo.jpg
assets/JoeyLib Logo.png
......@@ -22,19 +22,24 @@ SOURCES += \
src/test.c
SDL12 {
INCLUDEPATH += $$JOEY/sdks/linux/x64/include
SOURCES += src/jSDL12.c
LIBS += \
-L$$JOEY/sdks/linux/x64/lib \
-lSDL \
-Wl,-rpath,$$JOEY/sdks/linux/x64/lib \
-lSDL_mixer \
-lmikmod \
-lSDL \
-lm \
-ldl \
-lsndio
}
SDL2 {
INCLUDEPATH += $$JOEY/sdks/linux/x64/include
SOURCES += src/jSDL2.c
LIBS += \
......
......@@ -20,9 +20,15 @@
*/
#include "SDL/SDL.h"
#include "SDL/SDL_mixer.h"
#include "joey.h"
static SDL_Surface *_jlScreen = NULL;
void jlDisplayPresent(void) {
}
......@@ -42,6 +48,7 @@ void jlDrawBlit8x8a(jlSurfaceT source, jint16 cx1, jint16 cy1, jint16 cx2, jint1
(void)cy1;
(void)cx2;
(void)cy2;
(void)offset;
}
......@@ -201,12 +208,49 @@ void jlUtilNibbleSwap(byte *mem, jint16 count, byte old, byte new) {
void jlUtilShutdown(void) {
SDL_FreeSurface(_jlScreen);
jlSoundMusicStop();
Mix_CloseAudio();
Mix_Quit();
SDL_Quit();
jlUtilDie("Clean Exit.");
}
void jlUtilStartup(char *appTitle) {
Uint32 vflags;
int mflags;
int result;
(void)appTitle;
// Start low-level tools
if (SDL_Init(SDL_INIT_EVERYTHING) == -1) {
jlUtilDie(SDL_GetError());
}
// Start audio mixer & music system.
mflags = MIX_INIT_MOD;
result = Mix_Init(mflags);
if ((result & mflags) != mflags) {
jlUtilDie(Mix_GetError());
}
if (Mix_OpenAudio(11025, AUDIO_U8, 1, 1024) == -1) {
jlUtilDie(Mix_GetError());
}
// Set up video
vflags = SDL_HWSURFACE;
#ifdef JOEY_LINUX
SDL_WM_SetCaption(appTitle, NULL);
#else
vflags |= SDL_FULLSCREEN;
#endif
_jlScreen = SDL_SetVideoMode(320, 200, 16, vflags);
if (!_jlScreen) {
jlUtilDie(SDL_GetError());
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment