From 2d5cb26be687a6e443543e96350b40fa2dc98c8a Mon Sep 17 00:00:00 2001 From: sparky4 Date: Thu, 15 Dec 2016 12:20:50 -0600 Subject: [PATCH] testing with large memory model hmm something seems faster... wwww --- makefile | 23 +++++++++++------------ src/lib/16_sprit.c | 22 ++++++++++++++++++++++ 2 files changed, 33 insertions(+), 12 deletions(-) diff --git a/makefile b/makefile index 2ac4225c..f0374020 100755 --- a/makefile +++ b/makefile @@ -32,8 +32,6 @@ # serial output is plain text ASCII. DEBUGSERIAL=1 -DOSLIB_MEMMODE=dos86l - #192x144 #wwww will add these !ifdef __LINUX__ @@ -44,8 +42,8 @@ COPYCOMMAND=cp -f DIRSEP=/ OBJ=obj DUMP=cat -DOSLIBMAKE=./make.sh build all $(DOSLIB_MEMMODE) -DOSLIBMAKEALL=./buildall.sh build all $(DOSLIB_MEMMODE) +DOSLIBMAKE=./make.sh build all +DOSLIBMAKEALL=./buildall.sh build all !else #DOS ^^ to_os_path=/=\ REMOVECOMMAND=del @@ -79,6 +77,7 @@ DOSLIB_DOS=src/lib/doslib/hw/dos DOSLIB_VGA=src/lib/doslib/hw/vga DOSLIB_8250=src/lib/doslib/hw/8250 DOSLIB_JOYSTICK=src/lib/doslib/hw/joystick +DOSLIB_MEMMODE=dos86l # # quiet flags @@ -272,18 +271,18 @@ gfx.lib: $(GFXLIBOBJS) # # library deps 16-bit huge $(DOSLIB_CPU)/$(DOSLIB_MEMMODE)/cpu.lib: - cd $(DOSLIB_CPU:$(to_os_path)) && $(DOSLIBMAKE) && cd $(BUILD_ROOT) + cd $(DOSLIB_CPU:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT) $(DOSLIB_DOS)/$(DOSLIB_MEMMODE)/dos.lib: - cd $(DOSLIB_DOS:$(to_os_path)) && $(DOSLIBMAKE) && cd $(BUILD_ROOT) + cd $(DOSLIB_DOS:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT) $(DOSLIB_VGA)/$(DOSLIB_MEMMODE)/vgatty.lib: - cd $(DOSLIB_VGA:$(to_os_path)) && $(DOSLIBMAKE) && cd $(BUILD_ROOT) + cd $(DOSLIB_VGA:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT) $(DOSLIB_VGA)/$(DOSLIB_MEMMODE)/vga.lib: - cd $(DOSLIB_VGA:$(to_os_path)) && $(DOSLIBMAKE) && cd $(BUILD_ROOT) + cd $(DOSLIB_VGA:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT) $(DOSLIB_8250)/$(DOSLIB_MEMMODE)/8250.lib: - cd $(DOSLIB_8250:$(to_os_path)) && $(DOSLIBMAKE) && cd $(BUILD_ROOT) + cd $(DOSLIB_8250:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT) joytest.exe: - cd $(DOSLIB_JOYSTICK:$(to_os_path)) && $(DOSLIBMAKE) && cd $(BUILD_ROOT) + cd $(DOSLIB_JOYSTICK:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT) $(COPYCOMMAND) $(DOSLIB_JOYSTICK:$(to_os_path))$(DIRSEP)$(DOSLIB_MEMMODE)$(DIRSEP)test.exe joytest.exe 16_vl.$(OBJ):$(SRCLIB)/16_vl.c $(SRCLIB)/16_vl.h @@ -391,12 +390,12 @@ vomitchan: .symbolic #git submodule add mkdl: .symbolic @cd $(DOSLIB:$(to_os_path)) - @$(DOSLIBMAKEALL) + @$(DOSLIBMAKEALL) $(DOSLIB_MEMMODE) @cd $(BUILD_ROOT) cldl: .symbolic @cd $(DOSLIB:$(to_os_path)) - @$(DOSLIBMAKEALL) clean + @$(DOSLIBMAKEALL) $(DOSLIB_MEMMODE) clean @cd $(BUILD_ROOT) uplibs: .symbolic diff --git a/src/lib/16_sprit.c b/src/lib/16_sprit.c index 89d38906..d4daf597 100755 --- a/src/lib/16_sprit.c +++ b/src/lib/16_sprit.c @@ -1,3 +1,25 @@ +/* Project 16 Source Code~ + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover + * + * This file is part of Project 16. + * + * Project 16 is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * Project 16 is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see , or + * write to the Free Software Foundation, Inc., 51 Franklin Street, + * Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + #include "src/lib/16_sprit.h" char* get_curr_anim_name(struct sprite *spri) -- 2.39.5