mirror of
https://gitlab.com/octospacc/MultiSpaccSDK
synced 2025-06-05 22:09:21 +02:00
Add web build, unify screen update and frame wait function, update CI
This commit is contained in:
@ -5,51 +5,72 @@ SpaccSources = $(wildcard ../../LibMultiSpacc/*.c)
|
||||
SpaccHeaders = $(wildcard ../../LibMultiSpacc/*.h)
|
||||
CFlags = -Os -Werror -Wpedantic -Wdeclaration-after-statement
|
||||
|
||||
# Default build is always for the host system
|
||||
# TODO: handle other unixes
|
||||
ifeq ($(shell uname --operating-system), Msys)
|
||||
Host = Windows
|
||||
else
|
||||
Host = Linux
|
||||
endif
|
||||
|
||||
# When no user-specified target, build for the host system
|
||||
ifndef Target
|
||||
ifeq ($(shell uname --operating-system), Msys)
|
||||
ifeq ($(Host), Windows)
|
||||
Target = WindowsPC
|
||||
else
|
||||
else ifeq ($(Host), Linux)
|
||||
Target = LinuxPC
|
||||
endif
|
||||
endif
|
||||
|
||||
ifdef Target
|
||||
ifeq ($(Target), LinuxPC)
|
||||
ExeSuffix = .run
|
||||
Defines += -DTarget_LinuxPC
|
||||
MultiSpacc_Target = SDL20
|
||||
else ifeq ($(Target), WindowsPC)
|
||||
ExeSuffix = .exe
|
||||
Defines += -DTarget_WindowsPC
|
||||
MultiSpacc_Target = SDL20
|
||||
else ifeq ($(Target), Windows9x)
|
||||
ExeSuffix = .exe
|
||||
Defines += -DTarget_Windows9x
|
||||
MultiSpacc_Target = SDL12
|
||||
LdFlags += -lmingw32 -static-libgcc
|
||||
ToolsSyspath=/c/Files/Sdk/mingw32/bin
|
||||
ToolsPrefix=$(ToolsSyspath)/
|
||||
export PATH=$$PATH:$(ToolsSyspath)
|
||||
else ifeq ($(Target), NDS)
|
||||
Defines += -DTarget_NDS
|
||||
MultiSpacc_Target = NDS
|
||||
else ifeq ($(Target), NES)
|
||||
Defines += -DTarget_NES
|
||||
MultiSpacc_Target = NES
|
||||
# TODO: handle building for Windows targets from Linux hosts
|
||||
|
||||
ifeq ($(Target), LinuxPC)
|
||||
ExeSuffix = .run
|
||||
Defines += -DTarget_LinuxPC
|
||||
MultiSpacc_Target = SDL20
|
||||
else ifeq ($(Target), WindowsPC)
|
||||
ExeSuffix = .exe
|
||||
Defines += -DTarget_WindowsPC
|
||||
MultiSpacc_Target = SDL20
|
||||
ifneq ($(Host), Windows)
|
||||
ToolsSuffix = -mingw-w64
|
||||
endif
|
||||
else ifeq ($(Target), Windows9x)
|
||||
ExeSuffix = .exe
|
||||
Defines += -DTarget_Windows9x
|
||||
MultiSpacc_Target = SDL12
|
||||
LdFlags += -lmingw32 -static-libgcc
|
||||
ifeq ($(Host), Windows)
|
||||
ToolsSyspath = /c/Files/Sdk/mingw32/bin
|
||||
export PATH=$$PATH:$(ToolsSyspath)
|
||||
else
|
||||
ToolsSyspath = /opt/Sdk/mingw32/bin
|
||||
ToolsWrapper = wine
|
||||
endif
|
||||
ToolsPrefix = $(ToolsSyspath)/
|
||||
else ifeq ($(Target), Web)
|
||||
Defines += -DTarget_Web
|
||||
MultiSpacc_Target = Web
|
||||
else ifeq ($(Target), NDS)
|
||||
Defines += -DTarget_NDS
|
||||
MultiSpacc_Target = NDS
|
||||
else ifeq ($(Target), NES)
|
||||
Defines += -DTarget_NES
|
||||
MultiSpacc_Target = NES
|
||||
endif
|
||||
|
||||
ifeq ($(MultiSpacc_Target), SDL12)
|
||||
Defines += -DMultiSpacc_Target_SDL12 -DMultiSpacc_Target_SDLCom
|
||||
Defines += -DMultiSpacc_Target_SDL12 -DMultiSpacc_Target_SDLCom -DMultiSpacc_Target_SDLStandard
|
||||
CFlags += $(shell sdl-config --cflags)
|
||||
LdFlags += $(shell sdl-config --libs) -lSDLmain -lSDL -lSDL_image -lSDL_mixer -lSDL_ttf
|
||||
BuildProcess = __Normal__
|
||||
else ifeq ($(MultiSpacc_Target), SDL20)
|
||||
Defines += -DMultiSpacc_Target_SDL20 -DMultiSpacc_Target_SDLCom
|
||||
Defines += -DMultiSpacc_Target_SDL20 -DMultiSpacc_Target_SDLCom -DMultiSpacc_Target_SDLStandard
|
||||
CFlags += $(shell sdl2-config --cflags)
|
||||
LdFlags += $(shell sdl2-config --libs) -lSDL2main -lSDL2 -lSDL2_image -lSDL2_mixer -lSDL2_ttf
|
||||
BuildProcess = __Normal__
|
||||
else ifeq ($(MultiSpacc_Target), Web)
|
||||
Defines += -DMultiSpacc_Target_Web -DMultiSpacc_Target_SDL20 -DMultiSpacc_Target_SDLCom
|
||||
BuildProcess = __Web__
|
||||
else ifeq ($(MultiSpacc_Target), NDS)
|
||||
Defines += -DMultiSpacc_Target_NDS
|
||||
BuildProcess = __NDS__
|
||||
@ -58,16 +79,24 @@ else ifeq ($(MultiSpacc_Target), NES)
|
||||
BuildProcess = __NES__
|
||||
endif
|
||||
|
||||
CC = $(ToolsPrefix)gcc $(CFlags) $(Defines)
|
||||
BuildSources = $(AppSources) $(SpaccSources)
|
||||
BuildObjects = $(BuildSources:.c=.o)
|
||||
|
||||
ifeq ($(BuildProcess), __Normal__)
|
||||
CC = $(ToolsWrapper) $(ToolsPrefix)gcc$(ToolsSuffix) $(CFlags) $(Defines)
|
||||
endif
|
||||
|
||||
All all: $(BuildProcess)
|
||||
|
||||
# TODO: use virtual build dirs even for normals to allow linking against different libraries without recleaning
|
||||
__Normal__: $(BuildObjects)
|
||||
$(CC) $^ $(LdFlags) -o $(AppName)$(ExeSuffix)
|
||||
|
||||
__Web__:
|
||||
emcc $(BuildSources) -sWASM=1 -sUSE_SDL=2 -sUSE_SDL_IMAGE=2 -sSDL2_IMAGE_FORMATS='["png"]' -sUSE_SDL_TTF=2 -sUSE_SDL_MIXER=2 --preload-file Emscripten -o Emscripten.js
|
||||
cp ../Emscripten.html ./$(AppName.html)
|
||||
# TODO: bundle JS, WASM, and assets package in HTML file
|
||||
|
||||
# TODO: Fix include substitutions properly in non-standard build processes
|
||||
|
||||
__NDS__:
|
||||
|
||||
13
LibMultiSpacc/Examples/Emscripten.html
Normal file
13
LibMultiSpacc/Examples/Emscripten.html
Normal file
@ -0,0 +1,13 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8"/>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
|
||||
</head>
|
||||
<body>
|
||||
<canvas id="canvas" oncontextmenu="event.preventDefault()"></canvas>
|
||||
<script> var Module = { canvas: (function(){ return document.getElementById('canvas') })() } </script>
|
||||
<script src="Emscripten.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
@ -2,6 +2,17 @@
|
||||
|
||||
#define AppName "Hello World"
|
||||
|
||||
typedef struct MainArgs {
|
||||
int spriteX;
|
||||
int spriteY;
|
||||
int accelX;
|
||||
int accelY;
|
||||
MultiSpacc_SurfaceConfig *WindowConfig;
|
||||
MultiSpacc_Window *Window;
|
||||
MultiSpacc_Surface *Screen;
|
||||
MultiSpacc_Surface *TilesImg;
|
||||
} MainArgs;
|
||||
|
||||
/*{pal:"nes",layout:"nes"}*/
|
||||
const char PALETTE[32] = {
|
||||
0x03, // screen
|
||||
@ -15,67 +26,72 @@ const char PALETTE[32] = {
|
||||
0x0d,0x27,0x2a, // sprite 3
|
||||
};
|
||||
|
||||
Uint32 nextTick;
|
||||
|
||||
bool MainLoop( void *args )
|
||||
{
|
||||
MainArgs *margs = (MainArgs*)args;
|
||||
|
||||
MultiSpacc_Sprite( 0, margs->spriteX, margs->spriteY, 1, margs->TilesImg, margs->Screen );
|
||||
//scroll(spriteX,0);
|
||||
|
||||
margs->spriteX += margs->accelX;
|
||||
margs->spriteY += margs->accelY;
|
||||
|
||||
if( margs->spriteX >= margs->WindowConfig->Width )
|
||||
{
|
||||
margs->spriteX = 0;
|
||||
}
|
||||
|
||||
if( margs->spriteY == 0 || margs->spriteY == ( margs->WindowConfig->Height - 8 ) )
|
||||
{
|
||||
margs->accelY *= -1;
|
||||
}
|
||||
|
||||
// check keys
|
||||
// if ESC pressed exit
|
||||
// ...
|
||||
|
||||
if( !MultiSpacc_WaitUpdateDisplay( margs->Window, &nextTick ) )
|
||||
{
|
||||
MultiSpacc_PrintDebug("[E] Error Updating Screen.\n");
|
||||
return false;
|
||||
};
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
int main( int argc, char *argv[] )
|
||||
{
|
||||
int spriteX = 0;
|
||||
int spriteY = 0;
|
||||
int accelX = +1;
|
||||
int accelY = +2;
|
||||
|
||||
MainArgs margs = {0};
|
||||
MultiSpacc_SurfaceConfig WindowConfig = {0};
|
||||
MultiSpacc_Window *Window;
|
||||
MultiSpacc_Surface *Screen;
|
||||
MultiSpacc_Surface *TilesImg;
|
||||
|
||||
margs.WindowConfig = &WindowConfig;
|
||||
margs.accelX = +1;
|
||||
margs.accelY = +2;
|
||||
|
||||
WindowConfig.Width = 320;
|
||||
WindowConfig.Height = 240;
|
||||
WindowConfig.Bits = 16;
|
||||
memcpy( WindowConfig.Palette, PALETTE, 32 );
|
||||
//WindowConfig.Frequency = 50;
|
||||
Window = MultiSpacc_SetWindow( &WindowConfig /*, &PALETTE*/ );
|
||||
Screen = MultiSpacc_GetWindowSurface( Window );
|
||||
|
||||
if( Screen == NULL )
|
||||
margs.Window = MultiSpacc_SetWindow( &WindowConfig );
|
||||
margs.Screen = MultiSpacc_GetWindowSurface( margs.Window );
|
||||
|
||||
if( margs.Screen == NULL )
|
||||
{
|
||||
MultiSpacc_PrintDebug("[E] Error Initializing Video System.\n");
|
||||
return -1;
|
||||
};
|
||||
|
||||
MultiSpacc_SetAppTitle( Window, AppName );
|
||||
MultiSpacc_SetAppTitle( margs.Window, AppName );
|
||||
MultiSpacc_PrintDebug("[I] Ready!\n");
|
||||
|
||||
// Bitmap font borrowed from: <https://github.com/nesdoug/01_Hello/blob/master/Alpha.chr>
|
||||
// Copyright (c) 2018 Doug Fraker www.nesdoug.com (MIT)
|
||||
TilesImg = MultiSpacc_LoadImage( "CHARS.png", Screen, NULL );
|
||||
MultiSpacc_PrintText( "Hello, World!", Screen, &WindowConfig, 2, 2, TilesImg );
|
||||
MultiSpacc_PrintDebug("[I] Ready!\n");
|
||||
margs.TilesImg = MultiSpacc_LoadImage( "CHARS.png", margs.Screen, NULL );
|
||||
MultiSpacc_PrintText( "Hello, World!", margs.Screen, &WindowConfig, 2, 2, margs.TilesImg );
|
||||
|
||||
while(true)
|
||||
{
|
||||
MultiSpacc_Sprite( 0, spriteX, spriteY, 1, TilesImg, Screen );
|
||||
//scroll(spriteX,0);
|
||||
|
||||
spriteX += accelX;
|
||||
spriteY += accelY;
|
||||
|
||||
if( spriteX >= WindowConfig.Width )
|
||||
{
|
||||
spriteX = 0;
|
||||
}
|
||||
|
||||
if( spriteY == 0 || spriteY == (WindowConfig.Height - 8) )
|
||||
{
|
||||
accelY *= -1;
|
||||
}
|
||||
|
||||
if( MultiSpacc_UpdateWindowSurface(Window) != 0 )
|
||||
{
|
||||
MultiSpacc_PrintDebug("[E] Error Updating Screen.\n");
|
||||
return -1;
|
||||
};
|
||||
|
||||
// TODO: Implement cross-platform vblank-wait
|
||||
MultiSpacc_Sleep(16);
|
||||
}
|
||||
|
||||
return 0;
|
||||
return MultiSpacc_SetMainLoop( MainLoop, &margs );
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user