diff --git a/engine/build.bat b/engine/build.bat index 2e3730bcc..aff2b6c32 100644 --- a/engine/build.bat +++ b/engine/build.bat @@ -14,7 +14,7 @@ set BUILDBATCH=1 set TOOLS=../tools/bin;../tools/7-Zip;../tools/svn/bin set PATH=%TOOLS% -bash.exe build.sh all +bash.exe build.sh 5 @endlocal @rem ----------------------- Batch CMD Line Scripts ------------------------ diff --git a/engine/build.sh b/engine/build.sh index 397291624..62d6d45cd 100644 --- a/engine/build.sh +++ b/engine/build.sh @@ -42,11 +42,8 @@ function distribute { echo "PSP Platform Failed To Build!" exit 1 fi - if ! test -e "releases/DC/OpenBOR/1ST_READ.BIN"; then - echo "Dreamcast Platform Failed To Build!" - exit 1 - fi - if test -e "releases/WINDOWS/OpenBOR/OpenBOR.exe"; then + +if test -e "releases/WINDOWS/OpenBOR/OpenBOR.exe"; then cd ../tools/borpak/source/ . build.sh win cp borpak.exe ../../../engine/releases/WINDOWS/OpenBOR/ @@ -149,29 +146,6 @@ function vita { fi } -# Gp2x Environment && Compile -function gp2x { - export PATH=$OLD_PATH - . ./environ.sh 3 - if test $GP2XDEV; then - make clean BUILD_GP2X=1 - make BUILD_GP2X=1 - if test -f "./OpenBOR.gpe"; then - if test ! -e "./releases/GP2X"; then - mkdir ./releases/GP2X - mkdir ./releases/GP2X/OpenBOR - mkdir ./releases/GP2X/OpenBOR/Logs - mkdir ./releases/GP2X/OpenBOR/Paks - mkdir ./releases/GP2X/OpenBOR/Saves - mkdir ./releases/GP2X/OpenBOR/ScreenShots - fi - cp ./sdl/gp2x/modules/mmuhack.o ./releases/GP2X/OpenBOR/ - mv OpenBOR.gpe ./releases/GP2X/OpenBOR/ - fi - make clean BUILD_GP2X=1 - fi -} - # Linux Environment && Compile (common to all architectures) function linux { export PATH=$OLD_PATH @@ -253,24 +227,6 @@ function windows { fi } -# Dreamcast Environment && Compile -function dreamcast { - export PATH=$OLD_PATH - . ./environ.sh 6 - if test $KOS_BASE; then - make clean BUILD_DC=1 - make BUILD_DC=1 - if test -f "./1ST_READ.BIN"; then - if test ! -e "./releases/DC" ; then - mkdir ./releases/DC - mkdir ./releases/DC/OpenBOR - fi - mv 1ST_READ.BIN ./releases/DC/OpenBOR/ - fi - make clean BUILD_DC=1 - fi -} - # Wii Environment && Compile function wii { export PATH=$OLD_PATH @@ -317,36 +273,6 @@ function opendingux { fi } -# WIZ Environment && Compile -function wiz { - export PATH=$OLD_PATH - . ./environ.sh 9 - if test $WIZDEV; then - make clean BUILD_WIZ=1 - make BUILD_WIZ=1 - if test -f "./OpenBOR.gpe"; then - if test ! -e "./releases/WIZ"; then - mkdir ./releases/WIZ - mkdir ./releases/WIZ/OpenBOR - mkdir ./releases/WIZ/OpenBOR/Logs - mkdir ./releases/WIZ/OpenBOR/Paks - mkdir ./releases/WIZ/OpenBOR/Saves - mkdir ./releases/WIZ/OpenBOR/ScreenShots - fi - mv OpenBOR.gpe ./releases/WIZ/OpenBOR/ - if [ `echo $HOST_PLATFORM | grep -o "SVN"` ]; then - cp $SDKPATH/lib/target/libSDL-1.2.so.0.11.2 ./releases/WIZ/OpenBOR/ - cp $SDKPATH/lib/target/libSDL_gfx.so.0.0.17 ./releases/WIZ/OpenBOR/libSDL_gfx.so.0 - else - cp $SDKPATH/lib/warm_2.6.24.ko ./releases/WIZ/OpenBOR/ - cp $SDKPATH/lib/libSDL-1.2.so.0.11.2 ./releases/WIZ/OpenBOR/ - cp $SDKPATH/lib/libSDL_gfx.so.0.0.17 ./releases/WIZ/OpenBOR/libSDL_gfx.so.0 - fi - fi - make clean BUILD_WIZ=1 - fi -} - # Darwin Environment && Compile function darwin { export PATH=$OLD_PATH @@ -386,7 +312,6 @@ function build_all { linux_x86 linux_amd64 windows - dreamcast wii opendingux darwin @@ -401,13 +326,10 @@ function print_help { echo " 0 = Distribute" echo " 1 = PSP" echo " 2 = PS Vita" - echo " 3 = Gp2x" echo " 4 = Linux (x86, amd64) Example: $0 4 amd64" echo " 5 = Windows" - echo " 6 = Dreamcast" echo " 7 = Wii" echo " 8 = OpenDingux" - echo " 9 = Wiz" echo " 10 = Darwin" echo " all = build for all applicable targets" echo "-------------------------------------------------------" @@ -431,11 +353,6 @@ case $1 in vita ;; - 3) - version - gp2x - ;; - 4) version linux_something $2 @@ -446,11 +363,6 @@ case $1 in windows ;; - 6) - version - dreamcast - ;; - 7) version wii @@ -461,11 +373,6 @@ case $1 in opendingux ;; - 9) - version - wiz - ;; - 10) version darwin diff --git a/engine/openbor.c b/engine/openbor.c index cc2a0d462..ea240da6a 100644 --- a/engine/openbor.c +++ b/engine/openbor.c @@ -3831,78 +3831,6 @@ int load_colourmap(s_model *model, char *image1, char *image2) return 1; } -//PIXEL_x8 -// This function is used to enable remap command in 24bit mode -// So old mods can still run under 16/24/32bit color system -// This function should be called when all colourmaps are loaded, e.g., -// at the end of load_cached_model -// map flag is used to determine whether a colourmap is a real colourmap -int convert_map_to_palette(s_model *model, unsigned mapflag[]) -{ - int i, c; - unsigned char *newmap, *oldmap; - unsigned char *p1, *p2; - unsigned pb = pixelbytes[(int)screenformat]; - if(model->palette == NULL) - { - return 0; - } - for(c = 0; c < model->maps_loaded; c++) - { - if(mapflag[c] == 0) - { - continue; - } - if((newmap = malloc(PAL_BYTES)) == NULL) - { - shutdown(1, "Error convert_map_to_palette for model: %s\n", model->name); - } - // Create new colour map - memcpy(newmap, model->palette, PAL_BYTES); - oldmap = model->colourmap[c]; - for(i = 0; i < MAX_PAL_SIZE / 4; i++) - { - if(oldmap[i] == i) - { - continue; - } - p1 = newmap + i * pb; - p2 = model->palette + oldmap[i] * pb; - memcpy(p1, p2, pb); - } - model->colourmap[c] = newmap; - free(oldmap); - oldmap = NULL; - } - return 1; -} - -static int _load_palette16(unsigned char *palette, char *filename) -{ - int handle, i; - unsigned char tp[3]; - handle = openpackfile(filename, packfile); - if(handle < 0) - { - return 0; - } - memset(palette, 0, MAX_PAL_SIZE / 2); - for(i = 0; i < MAX_PAL_SIZE / 4; i++) - { - if(readpackfile(handle, tp, 3) != 3) - { - closepackfile(handle); - return 0; - } - ((unsigned short *)palette)[i] = colour16(tp[0], tp[1], tp[2]); - } - closepackfile(handle); - *(unsigned short *)palette = 0; - - return 1; -} - - static int _load_palette32(unsigned char *palette, char *filename) { int handle, i; @@ -3934,30 +3862,7 @@ static int _load_palette32(unsigned char *palette, char *filename) //load a 256 colors' palette int load_palette(unsigned char *palette, char *filename) { - int handle; - if(screenformat == PIXEL_32) - { - return _load_palette32(palette, filename); - } - else if(screenformat == PIXEL_16) - { - return _load_palette16(palette, filename); - } - - handle = openpackfile(filename, packfile); - if(handle < 0) - { - return 0; - } - if(readpackfile(handle, palette, 768) != 768) - { - closepackfile(handle); - return 0; - } - closepackfile(handle); - palette[0] = palette[1] = palette[2] = 0; - - return 1; + return _load_palette32(palette, filename); } // create blending tables for the palette @@ -3994,15 +3899,7 @@ void create_blend_tables_x8(unsigned char *tables[]) int i; for(i = 0; i < MAX_BLENDINGS; i++) { - switch(screenformat) - { - case PIXEL_16: - tables[i] = blending_table_functions16[i] ? (blending_table_functions16[i])() : NULL; - break; - case PIXEL_32: - tables[i] = blending_table_functions32[i] ? (blending_table_functions32[i])() : NULL; - break; - } + tables[i] = blending_table_functions32[i] ? (blending_table_functions32[i])() : NULL; } } @@ -4021,20 +3918,10 @@ void change_system_palette(int palindex) if(!level || palindex == 0 || palindex > level->numpalettes) { current_palette = 0; - if(screenformat == PIXEL_8) - { - palette_set_corrected(pal, savedata.gamma, savedata.gamma, savedata.gamma, savedata.brightness, savedata.brightness, savedata.brightness); - set_blendtables(blendings); // set global blending tables - } } else if(level) { current_palette = palindex; - if(screenformat == PIXEL_8) - { - palette_set_corrected(level->palettes[palindex - 1], savedata.gamma, savedata.gamma, savedata.gamma, savedata.brightness, savedata.brightness, savedata.brightness); - set_blendtables(level->blendings[palindex - 1]); - } } } @@ -4073,16 +3960,7 @@ void unload_background() int _makecolour(int r, int g, int b) { - switch(screenformat) - { - case PIXEL_8: - return palette_find(pal, r, g, b); - case PIXEL_16: - return colour16(r, g, b); - case PIXEL_32: - return colour32(r, g, b); - } - return 0; + return colour32(r, g, b); } // parses a color string in the format "R_G_B" or as a raw integer @@ -4266,12 +4144,8 @@ void load_background(char *filename, int createtables) { if(!loadscreen(filename, packfile, NULL, PIXEL_x8, &background)) { - if (screenformat == PIXEL_32) - { - if (loadscreen32(filename, packfile, &background)) printf("Loaded 32-bit background '%s'\n", filename); - else shutdown(1, "Error loading background (PIXEL_x8/PIXEL_32) file '%s'", filename); - } - else shutdown(1, "Error loading background (PIXEL_x8) file '%s'", filename); + if (loadscreen32(filename, packfile, &background)) printf("Loaded 32-bit background '%s'\n", filename); + else shutdown(1, "Error loading background (PIXEL_x8/PIXEL_32) file '%s'", filename); } if (background->pixelformat == PIXEL_x8) { @@ -4453,7 +4327,7 @@ void cache_background(char *filename) { if(!loadscreen(filename, packfile, NULL, pixelformat, &bg)) { - if (!(screenformat == PIXEL_32 && loadscreen32(filename, packfile, &bg))) + if(!loadscreen32(filename, packfile, &bg)) { freescreen(&bg); bg = NULL; @@ -11466,12 +11340,6 @@ s_model *load_cached_model(char *name, char *owner, char unload) } } - // we need to convert 8bit colourmap into 24bit palette - if(pixelformat == PIXEL_x8) - { - convert_map_to_palette(newchar, mapflag); - } - printf("Loading '%s' from %s\n", newchar->name, filename); lCleanup: @@ -15362,7 +15230,7 @@ void goto_mainmenu(int flag) void static backto_mainmenu() { int i = 0; - s_screen *pausebuffer = allocscreen(videomodes.hRes, videomodes.vRes, screenformat); + s_screen *pausebuffer = allocscreen(videomodes.hRes, videomodes.vRes, PIXEL_32); copyscreen(pausebuffer, vscreen); spriteq_draw(pausebuffer, 0, MIN_INT, MAX_INT, 0, 0); @@ -15402,7 +15270,7 @@ void pausemenu() int controlp = 0, i; int newkeys; s_set_entry *set = levelsets + current_set; - s_screen *pausebuffer = allocscreen(videomodes.hRes, videomodes.vRes, screenformat); + s_screen *pausebuffer = allocscreen(videomodes.hRes, videomodes.vRes, PIXEL_32); copyscreen(pausebuffer, vscreen); spriteq_draw(pausebuffer, 0, MIN_INT, MAX_INT, 0, 0); @@ -31065,7 +30933,7 @@ void update_scrolled_bg() 2, 2, 3, 3, 2, 2, 3, 3, 2, 2, 3, 3, 2, 3, 2, 3, }; // fast, constant rumbling, like in/on a van or trailer - int pb = pixelbytes[(int)screenformat]; + int pb = pixelbytes[(int)PIXEL_32]; if(time >= neon_time && !freezeall) // Added freezeall so neon lights don't update if animations are frozen { @@ -31950,15 +31818,7 @@ int set_color_correction(int gm, int br) video_set_color_correction(gm, br); return 1; #else - if(screenformat == PIXEL_8) - { - palette_set_corrected(pal, savedata.gamma, savedata.gamma, savedata.gamma, savedata.brightness, savedata.brightness, savedata.brightness); - return 1; - } - else - { - return 0; - } + return 0; #endif } @@ -32639,10 +32499,6 @@ int playgif(char *filename, int x, int y, int noskip) if(info->frame == 0) { vga_vwait(); - if(screenformat == PIXEL_8) - { - palette_set_corrected(backbuffer->palette, savedata.gamma, savedata.gamma, savedata.gamma, savedata.brightness, savedata.brightness, savedata.brightness); - } update(0, 0); } else @@ -34303,6 +34159,8 @@ void init_videomodes(int log) ArgList arglist; char argbuf[MAX_ARG_LEN + 1] = ""; + // + if(log) { printf("Initializing video............\n"); @@ -34409,31 +34267,7 @@ void init_videomodes(int log) } else if(stricmp(command, "colourdepth") == 0) { - pixelformat = PIXEL_x8; - value = GET_ARG(1); - if(stricmp(value, "8bit") == 0) - { - screenformat = PIXEL_8; - pixelformat = PIXEL_8; - } - else if(stricmp(value, "16bit") == 0) - { - screenformat = PIXEL_16; - bits = 16; - } - else if(stricmp(value, "32bit") == 0) - { - screenformat = PIXEL_32; - bits = 32; - } - else if(value[0] == 0) - { - screenformat = PIXEL_32; - } - else - { - shutdown(1, "Screen colour depth can only be either 8bit, 16bit or 32bit."); - } + printf("\nColordepth is depreciated. All modules are displayed with a 32bit color screen.\n\n"); } else if(stricmp(command, "forcemode") == 0) {} else if(command && command[0]) @@ -34585,7 +34419,7 @@ void init_videomodes(int log) video_stretch(savedata.stretch); #endif - if((vscreen = allocscreen(videomodes.hRes, videomodes.vRes, screenformat)) == NULL) + if((vscreen = allocscreen(videomodes.hRes, videomodes.vRes, PIXEL_32)) == NULL) { shutdown(1, "Not enough memory!\n"); } diff --git a/engine/openborscript.c b/engine/openborscript.c index a203c04a9..d6af51858 100644 --- a/engine/openborscript.c +++ b/engine/openborscript.c @@ -16391,7 +16391,7 @@ HRESULT openbor_allocscreen(ScriptVariant **varlist , ScriptVariant **pretvar, i ScriptVariant_ChangeType(*pretvar, VT_PTR); - screen = allocscreen((int)w, (int)h, screenformat); + screen = allocscreen((int)w, (int)h, PIXEL_32); if(screen) { clearscreen(screen); diff --git a/engine/sdl/menu.c b/engine/sdl/menu.c index 9be425f83..674765d78 100644 --- a/engine/sdl/menu.c +++ b/engine/sdl/menu.c @@ -452,10 +452,8 @@ void initMenu(int type) isFull = 1; bpp = 32; savedata.glscale = 0.0f; - screenformat = PIXEL_32; #endif - screenformat = bpp==32?PIXEL_32:PIXEL_16; pixelformat = PIXEL_x8; savedata.fullscreen = isFull; @@ -463,7 +461,7 @@ void initMenu(int type) videomodes.hRes = isWide ? 480 :320; videomodes.vRes = isWide ? 272 :240; videomodes.pixel = pixelbytes[PIXEL_32]; - vscreen = allocscreen(videomodes.hRes, videomodes.vRes, screenformat); + vscreen = allocscreen(videomodes.hRes, videomodes.vRes, PIXEL_32); video_set_mode(videomodes); @@ -472,7 +470,7 @@ void initMenu(int type) bgscreen = pngToScreen(isWide ? (void*) openbor_logo_480x272_png.data : (void*) openbor_logo_320x240_png.data); else bgscreen = pngToScreen(isWide ? (void*) openbor_menu_480x272_png.data : (void*) openbor_menu_320x240_png.data); - // CRxTRDude - Initialize log screen images + // CRxTRDude - Initialize log screen images logscreen = pngToScreen(isWide ? (void*) logviewer_480x272_png.data : (void*) logviewer_320x240_png.data); control_init(2); @@ -527,7 +525,7 @@ void drawMenu() printText((isWide ? 26 : 5), (isWide ? 11 : 4), WHITE, 0, 0, "OpenBoR %s", VERSION); printText((isWide ? 392 : 261),(isWide ? 11 : 4), WHITE, 0, 0, __DATE__); - //CRxTRDude - Fix for Android's text - Main menu + //CRxTRDude - Fix for Android's text - Main menu #ifdef ANDROID printText((isWide ? 23 : 4),(isWide ? 251 : 226), WHITE, 0, 0, "A1: Start Game"); printText((isWide ? 150 : 84),(isWide ? 251 : 226), WHITE, 0, 0, "A2: BGM Player"); @@ -760,7 +758,6 @@ void Menu() getBasePath(packfile, filelist[dListCurrentPosition+dListScrollPosition].filename, 1); free(filelist); - // Restore screenformat and pixelformat to their default values - screenformat = PIXEL_8; - pixelformat = PIXEL_8; + // Restore pixelformat default value. + pixelformat = PIXEL_x8; } diff --git a/engine/source/gamelib/anigif.c b/engine/source/gamelib/anigif.c index 713da5678..ea0e42331 100644 --- a/engine/source/gamelib/anigif.c +++ b/engine/source/gamelib/anigif.c @@ -470,12 +470,12 @@ int anigif_open(char *filename, char *packfilename, anigif_info *info) if(info->isRGB) { - info->backbuffer = allocscreen(info->info[0].gif_header.screenwidth, info->info[0].gif_header.screenheight, screenformat); + info->backbuffer = allocscreen(info->info[0].gif_header.screenwidth, info->info[0].gif_header.screenheight, PIXEL_32); clearscreen(info->backbuffer); } for(i = info->isRGB ? 2 : 0; i >= 0; i--) { - info->gifbuffer[i] = allocscreen(info->info[0].gif_header.screenwidth, info->info[0].gif_header.screenheight, screenformat); + info->gifbuffer[i] = allocscreen(info->info[0].gif_header.screenwidth, info->info[0].gif_header.screenheight, PIXEL_32); clearscreen(info->gifbuffer[i]); } info->frame = -1; @@ -586,31 +586,16 @@ static void anigif_updatebuffer(anigif_info *info) s_screen *backbuffer = info->backbuffer; s_screen **gifbuffer = info->gifbuffer; int i, l = backbuffer->width * backbuffer->height; - unsigned short *ps16, *ppr16, *ppg16, *ppb16; unsigned int *ps32, *ppr32, *ppg32, *ppb32; - switch(screenformat) + + ps32 = (unsigned int *)(backbuffer->data); + ppr32 = (unsigned int *)(gifbuffer[0]->data); + ppg32 = (unsigned int *)(gifbuffer[1]->data); + ppb32 = (unsigned int *)(gifbuffer[2]->data); + for(i = 0; i < l; i++) { - case PIXEL_16: - ps16 = (unsigned short *)(backbuffer->data); - ppr16 = (unsigned short *)(gifbuffer[0]->data); - ppg16 = (unsigned short *)(gifbuffer[1]->data); - ppb16 = (unsigned short *)(gifbuffer[2]->data); - for(i = 0; i < l; i++) - { - ps16[i] = ppr16[i] | ppg16[i] | ppb16[i]; - } - break; - case PIXEL_32: - ps32 = (unsigned int *)(backbuffer->data); - ppr32 = (unsigned int *)(gifbuffer[0]->data); - ppg32 = (unsigned int *)(gifbuffer[1]->data); - ppb32 = (unsigned int *)(gifbuffer[2]->data); - for(i = 0; i < l; i++) - { - ps32[i] = ppr32[i] | ppg32[i] | ppb32[i]; - //printf(" %u %u %u\n", ppr32[i], ppg32[i], ppb32[i]); - } - break; + ps32[i] = ppr32[i] | ppg32[i] | ppb32[i]; + //printf(" %u %u %u\n", ppr32[i], ppg32[i], ppb32[i]); } } diff --git a/engine/source/gamelib/pixelformat.c b/engine/source/gamelib/pixelformat.c index eaadb70ce..afc65b557 100644 --- a/engine/source/gamelib/pixelformat.c +++ b/engine/source/gamelib/pixelformat.c @@ -56,8 +56,7 @@ typedef struct }; } RGB16; -int pixelformat = PIXEL_8; -int screenformat = PIXEL_8; +int pixelformat = PIXEL_x8; int pixelbytes[(int)5] = {1, 1, 2, 3, 4}; unsigned channelr, channelg, channelb, tintcolor, tintmode; @@ -70,28 +69,27 @@ int clipx1, clipy1, clipx2, clipy2; //may be used many time so make a function void drawmethod_global_init(s_drawmethod *drawmethod) { - if(screenformat != PIXEL_8) + + if(drawmethod && drawmethod->flag) { - if(drawmethod && drawmethod->flag) - { #if REVERSE_COLOR - channelr = drawmethod->channelb; - channelb = drawmethod->channelr; + channelr = drawmethod->channelb; + channelb = drawmethod->channelr; #else - channelr = drawmethod->channelr; - channelb = drawmethod->channelb; + channelr = drawmethod->channelr; + channelb = drawmethod->channelb; #endif - channelg = drawmethod->channelg; - tintmode = drawmethod->tintmode; - tintcolor = drawmethod->tintcolor; - usechannel = (channelr < 255) || (channelg < 255) || (channelb < 255); - } - else - { - usechannel = tintmode = 0; - } + channelg = drawmethod->channelg; + tintmode = drawmethod->tintmode; + tintcolor = drawmethod->tintcolor; + usechannel = (channelr < 255) || (channelg < 255) || (channelb < 255); + } + else + { + usechannel = tintmode = 0; } + if((useclip = drawmethod && drawmethod->flag && drawmethod->clipw > 0 && drawmethod->cliph > 0)) { clipx1 = drawmethod->clipx; diff --git a/engine/source/gamelib/types.h b/engine/source/gamelib/types.h index 99fb23e64..ff13615eb 100644 --- a/engine/source/gamelib/types.h +++ b/engine/source/gamelib/types.h @@ -35,16 +35,16 @@ #define BLEND_HALF 5 #define MAX_BLENDINGS 6 + /* #define _copy24bitp(pd, ps) (pd)[0] = (ps)[0]; (pd)[1] = (ps)[1]; (pd)[2] = (ps)[2]; #define _copy24bit(pd, v) (pd)[0] = ((unsigned char*)(&(v)))[0]; (pd)[1] = ((unsigned char*)(&(v)))[1]; (pd)[2] = ((unsigned char*)(&(v)))[2]; */ extern int pixelformat; -extern int screenformat; // in bitmap.c extern int pixelbytes[(int)5]; -#define PAL_BYTES (screenformat==PIXEL_8?768:(pixelbytes[(int)screenformat]*256)) +#define PAL_BYTES ((pixelbytes[(int)PIXEL_32]*256)) // Define fixed-size integer types - these used to be in gfxtypes.h // TODO: use these for throughout the engine where fixed-length types are needed diff --git a/engine/vita/menu.c b/engine/vita/menu.c index fc0ca736f..8be29699b 100644 --- a/engine/vita/menu.c +++ b/engine/vita/menu.c @@ -371,7 +371,7 @@ static void drawMenu() strncat(listing, filelist[list+dListScrollPosition].filename, sizeof(listing)); extension = strrchr(listing, '.'); if (extension) *extension = '\0'; - + if (list == dListCurrentPosition) { shift = 2; @@ -474,7 +474,6 @@ static void setVideoMode() videomodes.vRes = 272; videomodes.pixel = 4; video_set_mode(videomodes); - screenformat = PIXEL_32; } void Menu() @@ -526,6 +525,5 @@ void Menu() } getBasePath(packfile, filelist[dListCurrentPosition+dListScrollPosition].filename, 1); free(filelist); - screenformat = PIXEL_8; } diff --git a/tools/dc-sdk/kos-svn-698.7z b/tools/dc-sdk/kos-svn-698.7z deleted file mode 100644 index 3890cde1e..000000000 Binary files a/tools/dc-sdk/kos-svn-698.7z and /dev/null differ diff --git a/tools/dc-tools/BootDreams-1.06c.7z b/tools/dc-tools/BootDreams-1.06c.7z deleted file mode 100644 index cdef6a4a8..000000000 Binary files a/tools/dc-tools/BootDreams-1.06c.7z and /dev/null differ diff --git a/tools/dc-tools/dc-load.7z b/tools/dc-tools/dc-load.7z deleted file mode 100644 index c59cbb1dd..000000000 Binary files a/tools/dc-tools/dc-load.7z and /dev/null differ diff --git a/tools/dc-tools/make-cd/Makefile b/tools/dc-tools/make-cd/Makefile deleted file mode 100644 index 0dde15f1d..000000000 --- a/tools/dc-tools/make-cd/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -CDRECORD = cdrecord dev=IODVDServices -SCRAMBLE = scramble -UNMOUNT = diskutil unmountDisk disk1 -DD = dd -CP = cp -MKISOFS = mkisofs -CAT = cat -TOUCH = touch -1ST_READ = /usr/local/dcdev/dcload/dcload-ip/target-src/1st_read/1st_read.bin -IP_BIN = /usr/local/dcdev/dcload/dcload-ip/make-cd/IP.BIN -DISC_SIZE = 700 -DATA_SIZE = du -h -I ".svn" -I ".DS_Store" cd | sed -e 's/[a-z,A-Z]//g' - -all: clean burn-data - -1st_read.bin: $(1ST_READ) - $(SCRAMBLE) $(1ST_READ) cd/1st_read.bin - -IP.BIN: $(IP_BIN) - $(CP) $(IP_BIN) IP.BIN - -audio.raw: - $(DD) if=/dev/zero of=audio.raw bs=2352 count=300 - -burn-audio: audio.raw - $(UNMOUNT) - $(CDRECORD) -v -speed=8 -tao -multi -audio audio.raw - touch burn-audio - -00DUMMY.DAT: 1st_read.bin IP.BIN burn-audio - @. dummy.sh $(DISC_SIZE) - -data.raw: 00DUMMY.DAT - $(UNMOUNT) - $(MKISOFS) -l -r -C `$(CDRECORD) -msinfo` -exclude-list exclude.list -G IP.BIN -o data.raw cd/ - touch burn-data - -burn-data: data.raw - $(UNMOUNT) - $(CDRECORD) -v -speed=8 -tao -multi -xa data.raw - -.PHONY : clean -clean: - rm -f cd/1st_read.bin cd/00DUMMY.DAT IP.BIN audio.raw data.raw burn-audio burn-data diff --git a/tools/dc-tools/make-cd/dummy.sh b/tools/dc-tools/make-cd/dummy.sh deleted file mode 100644 index ffc0f7706..000000000 --- a/tools/dc-tools/make-cd/dummy.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -DISC_SIZE=$1 -DATA_SIZE=`du -h -I ".svn" -I ".DS_Store" cd | sed -e 's/[a-z,A-Z]//g'` -DUMMY_SIZE=$((((DISC_SIZE-DATA_SIZE)-10)*1000000)) - -if [ "$DUMMY_SIZE" -gt 0 ]; then - echo "Generating 00DUMMY.DAT ($DUMMY_SIZE Zero'ed Bytes)" - dd if=/dev/zero of=cd/00DUMMY.DAT bs=$DUMMY_SIZE count=1 -fi diff --git a/tools/dc-tools/make-cd/exclude.list b/tools/dc-tools/make-cd/exclude.list deleted file mode 100644 index 7f5e005f8..000000000 --- a/tools/dc-tools/make-cd/exclude.list +++ /dev/null @@ -1,2 +0,0 @@ -.* - diff --git a/tools/dc-tools/scramble.7z b/tools/dc-tools/scramble.7z deleted file mode 100644 index eff037a35..000000000 Binary files a/tools/dc-tools/scramble.7z and /dev/null differ diff --git a/tools/gp2x-sdk/gp2x-sdk.7z b/tools/gp2x-sdk/gp2x-sdk.7z deleted file mode 100644 index d3d88476c..000000000 Binary files a/tools/gp2x-sdk/gp2x-sdk.7z and /dev/null differ diff --git a/tools/wiz-sdk/wiz-sdk.7z b/tools/wiz-sdk/wiz-sdk.7z deleted file mode 100644 index d0d144787..000000000 Binary files a/tools/wiz-sdk/wiz-sdk.7z and /dev/null differ