mirror of
https://gitlab.com/octospacc/MultiSpaccSDK
synced 2025-06-05 22:09:21 +02:00
[NDS] Fix console print (but temporarily break SDL), more secure Makefile
This commit is contained in:
@ -51,29 +51,17 @@ Normal: $(Objects)
|
||||
$(CC) $^ $(LdFlags) -o $(AppName)$(ExeSuffix)
|
||||
|
||||
NDS:
|
||||
#mkdir -p ./Build/NDS/Examples
|
||||
#cp -rT . ./Build/NDS/Examples/$(shell basename $(CURDIR)) || true
|
||||
#rm -rf ./Build/NDS/Examples/$(shell basename $(CURDIR))/Build
|
||||
#cp -rT ../../LibMultiSpacc ./Build/NDS/LibMultiSpacc
|
||||
#cp ../NDS.mk ./Build/NDS/Examples/$(shell basename $(CURDIR))/Makefile
|
||||
#ln -s $(wildcard ../../LibMultiSpacc/*.* ../../LibMultiSpacc/NDS/*.*) ./Build/NDS/Examples/$(shell basename $(CURDIR))/
|
||||
#cd ./Build/NDS/Examples/$(shell basename $(CURDIR)); make
|
||||
#$(eval VirtualBuildDir = ./Build/NDS/$(shell basename $(CURDIR)))
|
||||
#mkdir -p $(VirtualBuildDir)/source/LibMultiSpacc
|
||||
$(eval VirtualBuildDir = ./Build/NDS)
|
||||
mkdir -p $(VirtualBuildDir)/source/.tmp
|
||||
cp ../NDS.mk $(VirtualBuildDir)/Makefile
|
||||
#cp $(wildcard *) $(VirtualBuildDir)/source/
|
||||
#cp $(Sources) $(wildcard ../../LibMultiSpacc/*.* ../../LibMultiSpacc/NDS/*.*) $(VirtualBuildDir)/source/
|
||||
cp $(Sources) $(VirtualBuildDir)/source/
|
||||
cp $(wildcard ../../LibMultiSpacc/*.*) $(VirtualBuildDir)/source/.tmp/
|
||||
cd $(VirtualBuildDir)/source/.tmp; for i in *; do mv $$i ../LibMultiSpacc_$$i; done
|
||||
cp $(wildcard ../../LibMultiSpacc/NDS/*.*) $(VirtualBuildDir)/source/.tmp/
|
||||
cd $(VirtualBuildDir)/source/.tmp; for i in *; do mv $$i ../LibMultiSpacc_NDS_$$i; done
|
||||
#cp -rT ../../LibMultiSpacc $(VirtualBuildDir)/source/LibMultiSpacc
|
||||
for i in $(VirtualBuildDir)/source/*; do sed -i 's|"../../LibMultiSpacc/|"LibMultiSpacc_|g' $$i; done
|
||||
for i in $(VirtualBuildDir)/source/*; do sed -i 's|"../MultiSpacc|"LibMultiSpacc_MultiSpacc|g' $$i; done
|
||||
for i in $(VirtualBuildDir)/source/*; do sed -i 's|"NDS/|"LibMultiSpacc_NDS_|g' $$i; done
|
||||
for i in $(VirtualBuildDir)/source/*; do sed -i 's|#include[ \t]"../../LibMultiSpacc/|#include "LibMultiSpacc_|g' $$i; done
|
||||
for i in $(VirtualBuildDir)/source/*; do sed -i 's|#include[ \t]"../MultiSpacc|#include "LibMultiSpacc_MultiSpacc|g' $$i; done
|
||||
for i in $(VirtualBuildDir)/source/*; do sed -i 's|#include[ \t]"NDS/|#include "LibMultiSpacc_NDS_|g' $$i; done
|
||||
cd $(VirtualBuildDir); make
|
||||
|
||||
Run run: All
|
||||
|
Binary file not shown.
@ -2,31 +2,46 @@
|
||||
|
||||
#define AppName "Hello World"
|
||||
|
||||
int main( int argc, char *args[] )
|
||||
//MultiSpacc_Window consoleInnit(MultiSpacc_Window console){
|
||||
// consoleSelect(&console);
|
||||
// PrintConsole *consolePtr = consoleInit(&console, 3, BgType_Text4bpp, BgSize_T_256x256, 31, 0, false, true);
|
||||
// consoleSelect(&console);
|
||||
// consoleSelect(consolePtr);
|
||||
// return *consolePtr;
|
||||
//return *consoleInit(&Window, 3, BgType_Text4bpp, BgSize_T_256x256, 31, 0, false, true);
|
||||
//}
|
||||
|
||||
int main( void )
|
||||
{
|
||||
MultiSpacc_SurfaceConfig WindowConfig = { .Width = 320, .Height = 240, .Bits = 16 };
|
||||
MultiSpacc_Window *Window = MultiSpacc_SetWindow( WindowConfig );
|
||||
MultiSpacc_Surface *Screen = MultiSpacc_GetWindowSurface( Window );
|
||||
MultiSpacc_Window Window = MultiSpacc_SetWindow( WindowConfig );
|
||||
MultiSpacc_Surface *Screen = MultiSpacc_GetWindowSurface( &Window );
|
||||
|
||||
if( Screen == NULL )
|
||||
/* if( Screen == NULL )
|
||||
{
|
||||
printf("[E] Error Initializing Video System.\n");
|
||||
return -1;
|
||||
};
|
||||
};*/
|
||||
|
||||
MultiSpacc_SetAppTitle( Window, AppName );
|
||||
//MultiSpacc_SetAppTitle( Window, AppName );
|
||||
|
||||
//PrintConsole bottomScreen;
|
||||
//consoleInit(&Window, 3, BgType_Text4bpp, BgSize_T_256x256, 31, 0, false, true);
|
||||
//Window = consoleInnit(Window);
|
||||
//consoleSelect(&Window);
|
||||
|
||||
// Bitmap font borrowed from: <https://github.com/nesdoug/01_Hello/blob/master/Alpha.chr>
|
||||
// Copyright (c) 2018 Doug Fraker www.nesdoug.com (MIT)
|
||||
//MultiSpacc_Surface *TilesImg = MultiSpacc_LoadImage( "Tiles.png", Screen, NULL );
|
||||
MultiSpacc_PrintText( "Hello, World!", NULL, WindowConfig, 4, 4, NULL );
|
||||
|
||||
//MultiSpacc_PrintText( "Hello, World!", Screen, WindowConfig.Width, WindowConfig.Height, 4, 4, TilesImg );
|
||||
while(1){ swiWaitForVBlank(); }
|
||||
|
||||
if( MultiSpacc_UpdateWindowSurface( Window ) != 0 )
|
||||
/*if( MultiSpacc_UpdateWindowSurface( Window ) != 0 )
|
||||
{
|
||||
printf("[E] Error Updating Screen.\n");
|
||||
return -1;
|
||||
};
|
||||
};*/
|
||||
|
||||
MultiSpacc_Sleep( 3000 );
|
||||
return 0;
|
||||
|
Reference in New Issue
Block a user