Updated installer for Ubuntu/Mint 20.x
This commit is contained in:
Scott Duensing
parent
5c04ad6b02
commit
d3fa3874a1
2 changed files with 99 additions and 70 deletions
|
|
@ -103,6 +103,79 @@ void printAt(jlImgT *font, jlStnT *stencil, jint16 cx, jint16 cy, const char *wh
|
|||
}
|
||||
|
||||
|
||||
void blitTest(void) {
|
||||
jlImgT *font = NULL;
|
||||
jlStnT *stencil = NULL;
|
||||
jint16 y;
|
||||
jint16 x;
|
||||
bool doOnce = true;
|
||||
|
||||
if (!jlImgLoad(font, "font")) jlUtilDie("Unable to load font.sta!");
|
||||
if (!jlStnLoad(stencil, "font")) jlUtilDie("Unable to load font.stn!");
|
||||
|
||||
jlImgDisplay(font);
|
||||
jlDisplayPresent();
|
||||
jlKeyWaitForAny();
|
||||
|
||||
jlDrawColorSet(1);
|
||||
jlDrawClear();
|
||||
jlPaletteSet(15, 15, 15, 15);
|
||||
|
||||
printAt(font, NULL, 1, 2, "%s", "Blitting without stencil buffer.");
|
||||
printAt(font, stencil, 1, 4, "%s", "Blitting with stencil buffer.");
|
||||
jlDisplayPresent();
|
||||
jlKeyWaitForAny();
|
||||
|
||||
/*
|
||||
y = 91;
|
||||
while (!jlKeyPressed()) {
|
||||
for (x=0; x<319-8; x++) {
|
||||
|
||||
if (doOnce) {
|
||||
jlDrawBlit8x8a(jlImgSurfaceGet(font), stencil, 0, 2, 24, 24);
|
||||
jlDrawBlit8x8(jlImgSurfaceGet(font), 0, 2, 40, 24);
|
||||
doOnce = false;
|
||||
}
|
||||
|
||||
jlDrawBlit8x8(jlImgSurfaceGet(font), 1, 0, x, y);
|
||||
printAt(font, NULL, 1, 1, "Drawing at %d x %d ", x, y);
|
||||
jlDisplayPresent();
|
||||
jlDrawBlit8x8(jlImgSurfaceGet(font), 0, 0, x, y);
|
||||
jlUtilSleep(1);
|
||||
if (jlKeyPressed()) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
jlKeyRead();
|
||||
*/
|
||||
|
||||
jlStnFree(stencil);
|
||||
jlImgFree(font);
|
||||
}
|
||||
|
||||
|
||||
void grid() {
|
||||
int i;
|
||||
|
||||
jlDrawColorSet(0);
|
||||
jlDrawClear();
|
||||
jlDrawColorSet(15);
|
||||
|
||||
for (i=0; i<320; i+=8) {
|
||||
jlDrawLine(i, 0, i, 199);
|
||||
}
|
||||
for (i=0; i<200; i+=8) {
|
||||
jlDrawLine(0, i, 319, i);
|
||||
}
|
||||
|
||||
while (!jlKeyPressed()) {
|
||||
jlDisplayPresent();
|
||||
}
|
||||
jlKeyRead();
|
||||
}
|
||||
|
||||
|
||||
void lineTest(void) {
|
||||
|
||||
jlImgT *kanga = NULL;
|
||||
|
|
@ -206,63 +279,12 @@ void lineTest(void) {
|
|||
}
|
||||
|
||||
|
||||
void blitTest(void) {
|
||||
jlImgT *font = NULL;
|
||||
jlStnT *stencil = NULL;
|
||||
jint16 y;
|
||||
jint16 x;
|
||||
bool doOnce = true;
|
||||
|
||||
if (!jlImgLoad(font, "font")) jlUtilDie("Unable to load font.sta!");
|
||||
if (!jlStnLoad(stencil, "font")) jlUtilDie("Unable to load font.stn!");
|
||||
|
||||
jlImgDisplay(font);
|
||||
jlDisplayPresent();
|
||||
jlKeyWaitForAny();
|
||||
|
||||
jlDrawColorSet(1);
|
||||
jlDrawClear();
|
||||
jlPaletteSet(15, 15, 15, 15);
|
||||
|
||||
printAt(font, NULL, 1, 2, "%s", "Blitting without stencil buffer.");
|
||||
printAt(font, stencil, 1, 4, "%s", "Blitting with stencil buffer.");
|
||||
jlDisplayPresent();
|
||||
jlKeyWaitForAny();
|
||||
|
||||
/*
|
||||
y = 91;
|
||||
while (!jlKeyPressed()) {
|
||||
for (x=0; x<319-8; x++) {
|
||||
|
||||
if (doOnce) {
|
||||
jlDrawBlit8x8a(jlImgSurfaceGet(font), stencil, 0, 2, 24, 24);
|
||||
jlDrawBlit8x8(jlImgSurfaceGet(font), 0, 2, 40, 24);
|
||||
doOnce = false;
|
||||
}
|
||||
|
||||
jlDrawBlit8x8(jlImgSurfaceGet(font), 1, 0, x, y);
|
||||
printAt(font, NULL, 1, 1, "Drawing at %d x %d ", x, y);
|
||||
jlDisplayPresent();
|
||||
jlDrawBlit8x8(jlImgSurfaceGet(font), 0, 0, x, y);
|
||||
jlUtilSleep(1);
|
||||
if (jlKeyPressed()) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
jlKeyRead();
|
||||
*/
|
||||
|
||||
jlStnFree(stencil);
|
||||
jlImgFree(font);
|
||||
}
|
||||
|
||||
|
||||
int main(void) {
|
||||
jlUtilStartup("JoeyLib Test");
|
||||
|
||||
//blitTest();
|
||||
grid();
|
||||
//lineTest();
|
||||
blitTest();
|
||||
|
||||
jlUtilShutdown();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,14 +39,14 @@ G_XCODE_FILE=
|
|||
G_OSX_MIN=10.6
|
||||
G_OSX_DARWIN=17
|
||||
G_IIGS=0
|
||||
G_AMIGA=1
|
||||
G_ATARIST=1
|
||||
G_LINUX32=2
|
||||
G_LINUX64=3
|
||||
G_WIN32=4
|
||||
G_WIN64=5
|
||||
G_MAC32=6
|
||||
G_MAC64=7
|
||||
#G_AMIGA=1
|
||||
#G_ATARIST=2
|
||||
G_LINUX32=1
|
||||
G_LINUX64=2
|
||||
G_WIN32=3
|
||||
G_WIN64=4
|
||||
G_MAC32=5
|
||||
G_MAC64=6
|
||||
#G_ANDROID=9
|
||||
#G_IOS=10
|
||||
|
||||
|
|
@ -114,6 +114,9 @@ function buildPCDeps() {
|
|||
purple "Building SDL2"
|
||||
if [[ ! -d SDL ]]; then
|
||||
hg clone http://hg.libsdl.org/SDL
|
||||
pushd SDL &> /dev/null
|
||||
hg up release-2.0.12
|
||||
popd &> /dev/null
|
||||
fi
|
||||
if [[ ! -e "${PREFIX}/lib/libSDL2.a" ]]; then
|
||||
clearDepsBuild
|
||||
|
|
@ -137,6 +140,7 @@ function buildPCDeps() {
|
|||
if [[ ! -d libmodplug ]]; then
|
||||
git clone https://github.com/Konstanty/libmodplug.git
|
||||
pushd libmodplug &> /dev/null
|
||||
git checkout 48be2218a60fdcc4f0d8f474ddeaebd8c429f998
|
||||
libtoolize --force
|
||||
aclocal
|
||||
autoheader
|
||||
|
|
@ -163,6 +167,9 @@ function buildPCDeps() {
|
|||
purple "Building SDL_mixer"
|
||||
if [[ ! -d SDL_mixer ]]; then
|
||||
hg clone http://hg.libsdl.org/SDL_mixer
|
||||
pushd SDL_mixer &> /dev/null
|
||||
hg up release-2.0.4
|
||||
popd &> /dev/null
|
||||
fi
|
||||
if [[ ! -e "${PREFIX}/lib/libSDL2_mixer.a" ]]; then
|
||||
clearDepsBuild
|
||||
|
|
@ -646,7 +653,7 @@ function installLinux64() {
|
|||
"x86_64-linux-gnu-gcc" \
|
||||
"x86_64-linux-gnu-g++" \
|
||||
""
|
||||
buildSDL12 "x86_64-linux-gnu" "${JOEY}/sdks/linux/x64"
|
||||
#buildSDL12 "x86_64-linux-gnu" "${JOEY}/sdks/linux/x64"
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -786,8 +793,8 @@ function installWin64() {
|
|||
function mainMenu() {
|
||||
local ITEMS=(
|
||||
"IIgs"
|
||||
"Amiga"
|
||||
"ST"
|
||||
# "Amiga"
|
||||
# "ST"
|
||||
"Linux32"
|
||||
"Linux64"
|
||||
"Win32"
|
||||
|
|
@ -799,8 +806,8 @@ function mainMenu() {
|
|||
)
|
||||
local DESC=(
|
||||
"Apple IIgs 16"
|
||||
"Commodore Amiga 16"
|
||||
"Atari ST 16"
|
||||
# "Commodore Amiga 16"
|
||||
# "Atari ST 16"
|
||||
"Linux 32"
|
||||
"Linux 64"
|
||||
"Windows 32"
|
||||
|
|
@ -812,8 +819,8 @@ function mainMenu() {
|
|||
)
|
||||
local CHECK=(
|
||||
"IIgs/joeylib#b20000"
|
||||
"amiga/libjoeylib.a"
|
||||
"st/libjoeylib.a"
|
||||
# "amiga/libjoeylib.a"
|
||||
# "st/libjoeylib.a"
|
||||
"linux/i386/libjoeylib.a"
|
||||
"linux/x64/libjoeylib.a"
|
||||
"windows/i386/libjoeylib.a"
|
||||
|
|
@ -831,8 +838,8 @@ function mainMenu() {
|
|||
|
||||
G_IS_INSTALLED=(
|
||||
0
|
||||
0
|
||||
0
|
||||
# 0
|
||||
# 0
|
||||
0
|
||||
0
|
||||
0
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue