From 953de47c941b752f28f5bbe5779546ec96722dc6 Mon Sep 17 00:00:00 2001 From: Marrub Date: Mon, 21 Nov 2016 02:30:03 -0500 Subject: [PATCH] Move code and remove lithos3l.lib --- lithos_c/{ => lithos3}/Makefile | 15 ++- lithos_c/{ => lithos3}/inc/Lth.h | 0 lithos_c/{ => lithos3}/inc/Lth_assert.h | 0 lithos_c/{ => lithos3}/inc/Lth_callback.h | 0 lithos_c/{ => lithos3}/inc/Lth_context.h | 0 lithos_c/{ => lithos3}/inc/Lth_control.h | 0 lithos_c/{ => lithos3}/inc/Lth_draw.h | 0 lithos_c/{ => lithos3}/inc/Lth_font.h | 0 lithos_c/{ => lithos3}/inc/Lth_hashmap.h | 0 lithos_c/{ => lithos3}/inc/Lth_linklist.h | 0 lithos_c/{ => lithos3}/inc/Lth_manifest.h | 0 lithos_c/{ => lithos3}/inc/Lth_stdfix.h | 0 lithos_c/{ => lithos3}/inc/Lth_stdlib.h | 0 lithos_c/{ => lithos3}/inc/Lth_token.h | 0 lithos_c/{ => lithos3}/inc/Lth_tokenstream.h | 0 lithos_c/{ => lithos3}/inc/Lth_types.h | 0 lithos_c/{ => lithos3}/inc/Lth_window.h | 0 lithos_c/{ => lithos3}/inc/Lth_winman.h | 0 lithos_c/{ => lithos3}/src/context.c | 0 lithos_c/{ => lithos3}/src/control.c | 0 lithos_c/{ => lithos3}/src/draw.c | 0 lithos_c/{ => lithos3}/src/fontnew.c | 0 lithos_c/{ => lithos3}/src/fontrun.c | 0 lithos_c/{ => lithos3}/src/manifest.c | 0 lithos_c/{ => lithos3}/src/stdlib.c | 0 lithos_c/{ => lithos3}/src/token.c | 0 lithos_c/{ => lithos3}/src/tokenstream.c | 0 lithos_c/{ => lithos3}/src/window.c | 0 lithos_c/{ => lithos3}/src/winman.c | 0 lithos_c/src/main.c | 100 ------------------- loadacs.txt | 1 - 31 files changed, 6 insertions(+), 110 deletions(-) rename lithos_c/{ => lithos3}/Makefile (85%) rename lithos_c/{ => lithos3}/inc/Lth.h (100%) rename lithos_c/{ => lithos3}/inc/Lth_assert.h (100%) rename lithos_c/{ => lithos3}/inc/Lth_callback.h (100%) rename lithos_c/{ => lithos3}/inc/Lth_context.h (100%) rename lithos_c/{ => lithos3}/inc/Lth_control.h (100%) rename lithos_c/{ => lithos3}/inc/Lth_draw.h (100%) rename lithos_c/{ => lithos3}/inc/Lth_font.h (100%) rename lithos_c/{ => lithos3}/inc/Lth_hashmap.h (100%) rename lithos_c/{ => lithos3}/inc/Lth_linklist.h (100%) rename lithos_c/{ => lithos3}/inc/Lth_manifest.h (100%) rename lithos_c/{ => lithos3}/inc/Lth_stdfix.h (100%) rename lithos_c/{ => lithos3}/inc/Lth_stdlib.h (100%) rename lithos_c/{ => lithos3}/inc/Lth_token.h (100%) rename lithos_c/{ => lithos3}/inc/Lth_tokenstream.h (100%) rename lithos_c/{ => lithos3}/inc/Lth_types.h (100%) rename lithos_c/{ => lithos3}/inc/Lth_window.h (100%) rename lithos_c/{ => lithos3}/inc/Lth_winman.h (100%) rename lithos_c/{ => lithos3}/src/context.c (100%) rename lithos_c/{ => lithos3}/src/control.c (100%) rename lithos_c/{ => lithos3}/src/draw.c (100%) rename lithos_c/{ => lithos3}/src/fontnew.c (100%) rename lithos_c/{ => lithos3}/src/fontrun.c (100%) rename lithos_c/{ => lithos3}/src/manifest.c (100%) rename lithos_c/{ => lithos3}/src/stdlib.c (100%) rename lithos_c/{ => lithos3}/src/token.c (100%) rename lithos_c/{ => lithos3}/src/tokenstream.c (100%) rename lithos_c/{ => lithos3}/src/window.c (100%) rename lithos_c/{ => lithos3}/src/winman.c (100%) delete mode 100644 lithos_c/src/main.c diff --git a/lithos_c/Makefile b/lithos_c/lithos3/Makefile similarity index 85% rename from lithos_c/Makefile rename to lithos_c/lithos3/Makefile index d90486e..3f195bc 100644 --- a/lithos_c/Makefile +++ b/lithos_c/lithos3/Makefile @@ -22,10 +22,10 @@ MAKELIB=gdcc-makelib ## Directories -BIN=../acs +BIN=../../acs SRC=src INC=inc -IR=bin +IR=../bin ## Compiler flags @@ -79,15 +79,12 @@ OUTPUT=$(SOURCES:$(SRC)/%.c=$(IR)/%.ir) ## all -all: $(BIN)/lithos3l.bin $(BIN)/lithos3.bin +all: $(BIN)/lithos3.bin -## bin/lithos3*.bin +## bin/lithos3.bin -$(BIN)/lithos3l.bin: $(IR)/libc.ir $(IR)/libGDCC.ir - $(LD) $(LFLAGS) $(ALLOCMIN) 700000000 $^ -o $@ - -$(BIN)/lithos3.bin: $(OUTPUT) - $(LD) $(LFLAGS) $(ALLOCMIN) 7000000000 $^ -o $@ -llithos3l +$(BIN)/lithos3.bin: $(OUTPUT) $(IR)/libc.ir $(IR)/libGDCC.ir + $(LD) $(LFLAGS) $(ALLOCMIN) 7000000000 $^ -o $@ ## ir/*.ir diff --git a/lithos_c/inc/Lth.h b/lithos_c/lithos3/inc/Lth.h similarity index 100% rename from lithos_c/inc/Lth.h rename to lithos_c/lithos3/inc/Lth.h diff --git a/lithos_c/inc/Lth_assert.h b/lithos_c/lithos3/inc/Lth_assert.h similarity index 100% rename from lithos_c/inc/Lth_assert.h rename to lithos_c/lithos3/inc/Lth_assert.h diff --git a/lithos_c/inc/Lth_callback.h b/lithos_c/lithos3/inc/Lth_callback.h similarity index 100% rename from lithos_c/inc/Lth_callback.h rename to lithos_c/lithos3/inc/Lth_callback.h diff --git a/lithos_c/inc/Lth_context.h b/lithos_c/lithos3/inc/Lth_context.h similarity index 100% rename from lithos_c/inc/Lth_context.h rename to lithos_c/lithos3/inc/Lth_context.h diff --git a/lithos_c/inc/Lth_control.h b/lithos_c/lithos3/inc/Lth_control.h similarity index 100% rename from lithos_c/inc/Lth_control.h rename to lithos_c/lithos3/inc/Lth_control.h diff --git a/lithos_c/inc/Lth_draw.h b/lithos_c/lithos3/inc/Lth_draw.h similarity index 100% rename from lithos_c/inc/Lth_draw.h rename to lithos_c/lithos3/inc/Lth_draw.h diff --git a/lithos_c/inc/Lth_font.h b/lithos_c/lithos3/inc/Lth_font.h similarity index 100% rename from lithos_c/inc/Lth_font.h rename to lithos_c/lithos3/inc/Lth_font.h diff --git a/lithos_c/inc/Lth_hashmap.h b/lithos_c/lithos3/inc/Lth_hashmap.h similarity index 100% rename from lithos_c/inc/Lth_hashmap.h rename to lithos_c/lithos3/inc/Lth_hashmap.h diff --git a/lithos_c/inc/Lth_linklist.h b/lithos_c/lithos3/inc/Lth_linklist.h similarity index 100% rename from lithos_c/inc/Lth_linklist.h rename to lithos_c/lithos3/inc/Lth_linklist.h diff --git a/lithos_c/inc/Lth_manifest.h b/lithos_c/lithos3/inc/Lth_manifest.h similarity index 100% rename from lithos_c/inc/Lth_manifest.h rename to lithos_c/lithos3/inc/Lth_manifest.h diff --git a/lithos_c/inc/Lth_stdfix.h b/lithos_c/lithos3/inc/Lth_stdfix.h similarity index 100% rename from lithos_c/inc/Lth_stdfix.h rename to lithos_c/lithos3/inc/Lth_stdfix.h diff --git a/lithos_c/inc/Lth_stdlib.h b/lithos_c/lithos3/inc/Lth_stdlib.h similarity index 100% rename from lithos_c/inc/Lth_stdlib.h rename to lithos_c/lithos3/inc/Lth_stdlib.h diff --git a/lithos_c/inc/Lth_token.h b/lithos_c/lithos3/inc/Lth_token.h similarity index 100% rename from lithos_c/inc/Lth_token.h rename to lithos_c/lithos3/inc/Lth_token.h diff --git a/lithos_c/inc/Lth_tokenstream.h b/lithos_c/lithos3/inc/Lth_tokenstream.h similarity index 100% rename from lithos_c/inc/Lth_tokenstream.h rename to lithos_c/lithos3/inc/Lth_tokenstream.h diff --git a/lithos_c/inc/Lth_types.h b/lithos_c/lithos3/inc/Lth_types.h similarity index 100% rename from lithos_c/inc/Lth_types.h rename to lithos_c/lithos3/inc/Lth_types.h diff --git a/lithos_c/inc/Lth_window.h b/lithos_c/lithos3/inc/Lth_window.h similarity index 100% rename from lithos_c/inc/Lth_window.h rename to lithos_c/lithos3/inc/Lth_window.h diff --git a/lithos_c/inc/Lth_winman.h b/lithos_c/lithos3/inc/Lth_winman.h similarity index 100% rename from lithos_c/inc/Lth_winman.h rename to lithos_c/lithos3/inc/Lth_winman.h diff --git a/lithos_c/src/context.c b/lithos_c/lithos3/src/context.c similarity index 100% rename from lithos_c/src/context.c rename to lithos_c/lithos3/src/context.c diff --git a/lithos_c/src/control.c b/lithos_c/lithos3/src/control.c similarity index 100% rename from lithos_c/src/control.c rename to lithos_c/lithos3/src/control.c diff --git a/lithos_c/src/draw.c b/lithos_c/lithos3/src/draw.c similarity index 100% rename from lithos_c/src/draw.c rename to lithos_c/lithos3/src/draw.c diff --git a/lithos_c/src/fontnew.c b/lithos_c/lithos3/src/fontnew.c similarity index 100% rename from lithos_c/src/fontnew.c rename to lithos_c/lithos3/src/fontnew.c diff --git a/lithos_c/src/fontrun.c b/lithos_c/lithos3/src/fontrun.c similarity index 100% rename from lithos_c/src/fontrun.c rename to lithos_c/lithos3/src/fontrun.c diff --git a/lithos_c/src/manifest.c b/lithos_c/lithos3/src/manifest.c similarity index 100% rename from lithos_c/src/manifest.c rename to lithos_c/lithos3/src/manifest.c diff --git a/lithos_c/src/stdlib.c b/lithos_c/lithos3/src/stdlib.c similarity index 100% rename from lithos_c/src/stdlib.c rename to lithos_c/lithos3/src/stdlib.c diff --git a/lithos_c/src/token.c b/lithos_c/lithos3/src/token.c similarity index 100% rename from lithos_c/src/token.c rename to lithos_c/lithos3/src/token.c diff --git a/lithos_c/src/tokenstream.c b/lithos_c/lithos3/src/tokenstream.c similarity index 100% rename from lithos_c/src/tokenstream.c rename to lithos_c/lithos3/src/tokenstream.c diff --git a/lithos_c/src/window.c b/lithos_c/lithos3/src/window.c similarity index 100% rename from lithos_c/src/window.c rename to lithos_c/lithos3/src/window.c diff --git a/lithos_c/src/winman.c b/lithos_c/lithos3/src/winman.c similarity index 100% rename from lithos_c/src/winman.c rename to lithos_c/lithos3/src/winman.c diff --git a/lithos_c/src/main.c b/lithos_c/src/main.c deleted file mode 100644 index fbfced1..0000000 --- a/lithos_c/src/main.c +++ /dev/null @@ -1,100 +0,0 @@ -//----------------------------------------------------------------------------- -// -// Copyright © 2016 Project Golan -// -// See "LICENSE" for more information. -// -//----------------------------------------------------------------------------- -// -// Program entry point. -// -//----------------------------------------------------------------------------- - -#include "Lth.h" - -#include -#include - -#define Test_Text - - -// Static Functions ----------------------------------------------------------| - -[[__call("ScriptS"), __script("Enter")]] -static void main() -{ - Lth_Context *ctx = Lth_ContextNew(320, 200, 0x5000, 0x1000); - -#if defined(Test_Text) - - char const *test = - u8" ɢ ᴜ ᴅ\n" - "ASCII test\n" - "!\"#$%&'()*+,-./0123456789:;<=>?@A\n" - "BCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_\n\n" - "kanalang test\n" - "ァサラルコ（エワイホロア♥ツレカク\n" - "スノタヘチォメテケウョシヲーキマ\n" - "ドニリヤゥソムフミンィェト、セ\n" - "ュハユヒ。ャオモッヌ〜ヨ）ナネ\n\n" - "Spacing and missing character test\n" - "The quick b\trown fox jumps over\n" - "the lazy, ta\tbulated dog.ᴇᴇ\n\n" - "Iroha\n" - "色はにほへど　散りぬるを\n" - "我が世たれぞ　常ならむ・\n" - "有為の奥山　　今日越えて\n" - "浅き夢見じ　　酔ひもせず"; - - char const **defFont = Lth_ContextResource(ctx, "Base.DefaultFont"); - Lth_Font *font = Lth_FontNew(*defFont); - - for(;;) - { - Lth_ContextRun(ctx); - - Lth_FontRunBegin(); - Lth_PrintString(test); - Lth_FontRunPlain(ctx, font, 40, 20); - - ACS_Delay(1); - } - -#elif defined(Test_Windowing) - - Lth_WindowManager *wm = Lth_WMNew(ctx); - - Lth_Window *window[] = { - Lth_WindowNew(ctx, "test window", -1, -1, 50, 100), - Lth_WindowNew(ctx, u8"テスト　ウィンドー　2", -1, -1, 100, 100), - Lth_WindowNew(ctx, "test window 3", -1, -1, 100, 30), - Lth_WindowNew(ctx, "test window 4", -1, -1, 100, 100) - }; - - for(int i = 0; i < 4; i++) - Lth_WMMap(wm, window[i]); - - for(;;) - { - Lth_ContextRun(ctx); - Lth_ControlRun(wm); - ACS_Delay(1); - } - -#elif defined(Test_NoWM) - - Lth_Window *window = Lth_WindowNew(ctx, "test window", 20, 20, 100, 100); - - for(;;) - { - Lth_ContextRun(ctx); - Lth_ControlRun(window); - ACS_Delay(1); - } - -#endif - - Lth_ContextDestroy(ctx); -} - -// EOF diff --git a/loadacs.txt b/loadacs.txt index 171d16d..e1ca317 100644 --- a/loadacs.txt +++ b/loadacs.txt @@ -1,2 +1 @@ -lithos3l lithos3