Moved some more things around

mateoconlechuga · mateoconlechuga · commit d65f36bf27a1 · 2017-04-06T13:50:47.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@
 *.obj
 *.elf
 obj/
+release/
 
 # Precompiled Headers
 *.gch
diff --git a/changelog.md b/changelog.md
@@ -2,7 +2,28 @@
 
 ## [Unreleased](https://github.com/CE-Programming/toolchain/tree/HEAD)
 
-[Full commit list](https://github.com/CE-Programming/toolchain/compare/v6.95...HEAD)
+[Full commit list](https://github.com/CE-Programming/toolchain/compare/v7.0...HEAD)
+
+# [v7.0](https://github.com/CE-Programming/toolchain/releases/tag/v7.0) (2017-02-17)
+
+[Full commit list](https://github.com/CE-Programming/toolchain/compare/v6.95...v7.0)
+
+### Toolchain
+  - Rework entire toolchain setup and hierarchy ([`559dd1c`](https://github.com/CE-Programming/toolchain/commit/559dd1c) - [MattWaltz](https://github.com/MattWaltz))
+  - Doxygen header files ([`4402637`](https://github.com/CE-Programming/toolchain/commit/4402637) - [MattWaltz](https://github.com/MattWaltz))
+
+### Libraries
+
+#####  GRAPHX
+  - Added gfx_FloodFill ([`60006ac`](https://github.com/CE-Programming/toolchain/commit/60006ac) - [MattWaltz](https://github.com/MattWaltz))
+  - Added gfx_ScaleSprite ([`7618598`](https://github.com/CE-Programming/toolchain/commit/7618598) - [MattWaltz](https://github.com/MattWaltz))
+  - Added gfx_SetFontHeight ([`4402637`](https://github.com/CE-Programming/toolchain/commit/4402637) - [MattWaltz](https://github.com/MattWaltz))
+  - Optimized ClipDraw helper function ([`82e5d5a`](https://github.com/CE-Programming/toolchain/commit/82e5d5a) - [MattWaltz](https://github.com/MattWaltz))
+  - Optimized gfx_AllocSprite ([`2c12310`](https://github.com/CE-Programming/toolchain/commit/2c12310) - [Runer112](https://github.com/Runer112))
+
+# [v6.999](https://github.com/CE-Programming/toolchain/releases/tag/v6.999) (2017-02-17)
+
+[Full commit list](https://github.com/CE-Programming/toolchain/compare/v6.95...v6.999)
 
 ### Toolchain
   - Add scripts to build/clean libraries and examples easily ([`61d915f`](https://github.com/CE-Programming/toolchain/commit/61d915f) - [MattWaltz](https://github.com/MattWaltz))
diff --git a/examples/fileio_detect/src/main.c b/examples/fileio_detect/src/main.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 /* Shared library headers -- depends on which ones you wish to use */
-#include <libs/fileioc.h>
+#include <lib/fileioc.h>
 
 /* Function prototypes */
 void printText(int8_t xpos, int8_t ypos, const char *text);
diff --git a/examples/fileio_factorize/src/main.c b/examples/fileio_factorize/src/main.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 /* Shared library headers - depends on which ones you wish to use */
-#include <libs/fileioc.h>
+#include <lib/fileioc.h>
 
 void prime_factors(unsigned int n);
 
diff --git a/examples/fileio_os_vars/src/main.c b/examples/fileio_os_vars/src/main.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 /* Shared library headers - depends on which ones you wish to use */
-#include <libs/fileioc.h>
+#include <lib/fileioc.h>
 
 /* Some function prototypes. Maybe in the future these functions will become a library */
 cplx_t Int24sToCplx(int real, int imag);
diff --git a/examples/fileio_read_write/src/main.c b/examples/fileio_read_write/src/main.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 /* Shared library headers -- depends on which ones you wish to use */
-#include <libs/fileioc.h>
+#include <lib/fileioc.h>
 
 /* Declare some strings and variables */
 const char nameAppVar[] = "AppVar";
diff --git a/examples/fileio_tokens/src/main.c b/examples/fileio_tokens/src/main.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 /* Shared library headers -- depends on which ones you wish to use */
-#include <libs/fileioc.h>
+#include <lib/fileioc.h>
 
 /* Declare some strings and variables */
 const char prgmName[] = "ABC";
diff --git a/examples/gfx_buffered_cube/src/main.c b/examples/gfx_buffered_cube/src/main.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 /* Shared libraries */
-#include <libs/graphx.h>
+#include <lib/graphx.h>
 
 /* Put function prototypes here */
 void rotate(void);
diff --git a/examples/gfx_buffering/src/main.c b/examples/gfx_buffering/src/main.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 /* Shared libraries */
-#include <libs/graphx.h>
+#include <lib/graphx.h>
 
 /*
  * This tutorial is meant to be played around with to get a feeling for how buffering works
diff --git a/examples/gfx_char/src/main.c b/examples/gfx_char/src/main.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 /* Shared libraries */
-#include <libs/graphx.h>
+#include <lib/graphx.h>
 
 /* Use some random color as the transparent one */
 #define TRANSPARENT_COLOR 10
diff --git a/examples/gfx_clipping/src/main.c b/examples/gfx_clipping/src/main.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 /* Shared libraries */
-#include <libs/graphx.h>
+#include <lib/graphx.h>
 
 /* Use some random color as the transparent one */
 #define TRANSPARENT_COLOR 10
diff --git a/examples/gfx_floodfill/src/main.c b/examples/gfx_floodfill/src/main.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 /* Shared libraries */
-#include <libs/graphx.h>
+#include <lib/graphx.h>
  
 /* Put function prototypes here */
 
diff --git a/examples/gfx_hello_world/src/main.c b/examples/gfx_hello_world/src/main.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 /* Shared libraries */
-#include <libs/graphx.h>
+#include <lib/graphx.h>
 
 #define FONT_HEIGHT 8
 
diff --git a/examples/gfx_light_dark/src/main.c b/examples/gfx_light_dark/src/main.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 /* Shared libraries */
-#include <libs/graphx.h>
+#include <lib/graphx.h>
 
 #define color gfx_RGBTo1555(34, 55, 89)
 
diff --git a/examples/gfx_shapes_shift/src/main.c b/examples/gfx_shapes_shift/src/main.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 /* Shared libraries */
-#include <libs/graphx.h>
+#include <lib/graphx.h>
 
 /* Place function prototypes here */
 
diff --git a/examples/gfx_sprite/src/main.c b/examples/gfx_sprite/src/main.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 /* Shared libraries */
-#include <libs/graphx.h>
+#include <lib/graphx.h>
 
 /* Include the sprite data */
 #include "gfx/logo_gfx.h"
diff --git a/examples/gfx_sprite_compress/src/main.c b/examples/gfx_sprite_compress/src/main.c
@@ -14,7 +14,7 @@
 #include <decompress.h>
 
 /* Shared libraries */
-#include <libs/graphx.h>
+#include <lib/graphx.h>
 #include "gfx/all_gfx.h"
 
 /* Put all your code here */
diff --git a/examples/gfx_sprite_rotate/src/main.c b/examples/gfx_sprite_rotate/src/main.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 /* Shared libraries */
-#include <libs/graphx.h>
+#include <lib/graphx.h>
 #include "gfx/logo_gfx.h"
 
 /* Defines used below */
diff --git a/examples/gfx_tilemap/src/main.c b/examples/gfx_tilemap/src/main.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 /* Shared libraries */
-#include <libs/graphx.h>
+#include <lib/graphx.h>
 #include "gfx/tiles_gfx.h"
 
 /* Tilemap defines */
diff --git a/examples/gfx_tilemap_compress/src/main.c b/examples/gfx_tilemap_compress/src/main.c
@@ -14,7 +14,7 @@
 #include <decompress.h>
 
 /* Shared libraries */
-#include <libs/graphx.h>
+#include <lib/graphx.h>
 #include "gfx/tiles_gfx.h"
 
 /* Tilemap defines */
diff --git a/examples/keypad_arrows/src/main.c b/examples/keypad_arrows/src/main.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 /* CE Keypad C Library */
-#include <libs/keypadc.h>
+#include <lib/keypadc.h>
 
 /* Some LCD defines */
 void fillScreen(uint8_t color);
diff --git a/examples/keypad_interrupt/src/main.c b/examples/keypad_interrupt/src/main.c
@@ -14,7 +14,7 @@
 #include <intce.h>
 
 /* CE Keypad C Library */
-#include <libs/keypadc.h>
+#include <lib/keypadc.h>
 
 /* Function prototypes */
 void interrupt isr_on(void);
diff --git a/examples/keypad_interrupt2/src/main.c b/examples/keypad_interrupt2/src/main.c
@@ -14,7 +14,7 @@
 #include <intce.h>
 
 /* CE Keypad C Library */
-#include <libs/keypadc.h>
+#include <lib/keypadc.h>
 
 /* Function prototypes */
 void interrupt isr_on(void);
diff --git a/examples/keypad_multiple_keys/src/main.c b/examples/keypad_multiple_keys/src/main.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 /* CE Keypad C Library */
-#include <libs/keypadc.h>
+#include <lib/keypadc.h>
 
 /* Function prototypes */
 void printText(int8_t xpos, int8_t ypos, const char *text);
diff --git a/installer/installer.nsi b/installer/installer.nsi
@@ -1,45 +1,42 @@
- !include "MUI2.nsh"
- !include "EnvVarUpdate.nsh"
- !include "winmessages.nsh"
- !define env_hkcu 'HKCU "Environment"'
- 
- !define MUI_ICON "icon.ico"
 ;--------------------------------
+; Incldudes
+
+  !include "MUI2.nsh"
+  !include "EnvVarUpdate.nsh"
+  !include "winmessages.nsh"
+  
+;--------------------------------
+;Names
 
   Name "CE C SDK"
   BrandingText "CE C Software Development Kit"
   
 ;--------------------------------
+;Input and output
 
-  ;Name and file
   OutFile "CEdev.exe"
-  
-  ; Get system drive
-
-  ;Default installation folder
   InstallDir "$INSTDIR"
-
-  ;Request application privileges for Windows Vista
   RequestExecutionLevel admin
 
 ;--------------------------------
-;Interface Settings
+;Interface and defines
 
+  !define env_hkcu 'HKCU "Environment"'
   !define MUI_ABORTWARNING
+  !define MUI_ICON "icon.ico"
   
 ;--------------------------------
 ;Pages
 
   !define MUI_PAGE_CUSTOMFUNCTION_LEAVE "DirectoryLeave"
-  
   !insertmacro MUI_PAGE_DIRECTORY
+  
   !insertmacro MUI_PAGE_INSTFILES
 
 ;--------------------------------
 ;Languages
  
   !insertmacro MUI_LANGUAGE "English"
-  !insertmacro MUI_LANGUAGE "French"
   
 ;--------------------------------
 ;Installer Section
@@ -48,24 +45,22 @@ Section ""
 
   SetOutPath "$INSTDIR"
   
-  ;Add installed folder (DIST_PATH is set from the makefile)
   File /r ${DIST_PATH}\*.*
   
-  ;Check for old path
   ReadRegStr $R1 ${env_hkcu} "CEDEV"
   ${EnvVarUpdate} $0 "PATH" "R" "HKLM" "$R1\bin"
 
-  ;Add to PATH
   ${EnvVarUpdate} $0 "PATH" "A" "HKLM" "$INSTDIR\bin"
 
-  ;Add CEDEV variable
   WriteRegExpandStr ${env_hkcu} "CEDEV" "$INSTDIR"
   
-  ; make sure windows knows about the change
   SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
 
 SectionEnd
 
+;--------------------------------
+;Check for spaces
+
 Function DirectoryLeave
 
   Push $INSTDIR
@@ -105,9 +100,14 @@ Function CheckForSpaces
  
 FunctionEnd
 
+;--------------------------------
+; Find system drive
+
 Function .onInit
 
   ReadEnvStr $R0 SYSTEMDRIVE
   StrCpy $INSTDIR "$R0\CEdev"
   
 FunctionEnd
+
+;--------------------------------
diff --git a/makefile b/makefile
@@ -156,7 +156,7 @@ $(DIRS):
 	$(MKDIR) $(call NATIVEPATH,$(INSTALLLIB)/asm)
 	$(MKDIR) $(call NATIVEPATH,$(INSTALLINC)/ce)
 	$(MKDIR) $(call NATIVEPATH,$(INSTALLINC)/std)
-	$(MKDIR) $(call NATIVEPATH,$(INSTALLINC)/ce/libs)
+	$(MKDIR) $(call NATIVEPATH,$(INSTALLINC)/ce/lib)
 
 dist: install
 	$(ARCH)
diff --git a/src/fileioc/fileioc.asm b/src/fileioc/fileioc.asm
@@ -1,9 +1,9 @@
 #include "..\include\relocation.inc"
 #include "..\include\ti84pce.inc"
 
- .libraryAppVar         "FILEIOC"       ; Name of library on the calc
- .libraryName		    "fileioc"       ; Name of library
- .libraryVersion        3               ; Version information (1-255)
+ .libraryAppVar     "FILEIOC"       ; Name of library on the calc
+ .libraryName       "fileioc"       ; Name of library
+ .libraryVersion    3               ; Version information (1-255)
  
 ;-------------------------------------------------------------------------------
 ; v1 functions -- Cannot move/delete/insert (Can fix/optimize though)
diff --git a/src/fileioc/makefile b/src/fileioc/makefile
@@ -40,7 +40,7 @@ BIN        ?= $(call NATIVEPATH,$(DEV)/bin)
 INSTALLLOC := $(call NATIVEPATH,$(DESTDIR)$(DEV))
 LIB_LOC    := $(call NATIVEPATH,$(INSTALLLOC)/lib)
 LIBH_LOC   := $(call NATIVEPATH,$(INSTALLLOC)/lib/asm)
-H_LOC      := $(call NATIVEPATH,$(INSTALLLOC)/include/ce/libs)
+H_LOC      := $(call NATIVEPATH,$(INSTALLLOC)/include/ce/lib/)
 
 EZOBJ       = $(wildcard *.obj)
 EZSRC       = $(wildcard *.src)
diff --git a/src/graphc/graphc.h b/src/graphc/graphc.h
diff --git a/src/graphx/graphx.asm b/src/graphx/graphx.asm
diff --git a/src/graphx/graphx.h b/src/graphx/graphx.h
diff --git a/src/graphx/makefile b/src/graphx/makefile
diff --git a/src/keypadc/keypadc.asm b/src/keypadc/keypadc.asm
diff --git a/src/keypadc/makefile b/src/keypadc/makefile
diff --git a/src/std/format.h b/src/std/format.h
diff --git a/src/std/linked/ufltinfo.src b/src/std/linked/ufltinfo.src
diff --git a/src/std/linked/ufltrnd.src b/src/std/linked/ufltrnd.src
diff --git a/src/std/shared/log2.src b/src/std/shared/log2.src
