1
0
Fork 0
Browse Source

Move code and remove lithos3l.lib

master
Marrub 6 years ago
parent
commit
953de47c94
  1. 15
      lithos_c/lithos3/Makefile
  2. 0
      lithos_c/lithos3/inc/Lth.h
  3. 0
      lithos_c/lithos3/inc/Lth_assert.h
  4. 0
      lithos_c/lithos3/inc/Lth_callback.h
  5. 0
      lithos_c/lithos3/inc/Lth_context.h
  6. 0
      lithos_c/lithos3/inc/Lth_control.h
  7. 0
      lithos_c/lithos3/inc/Lth_draw.h
  8. 0
      lithos_c/lithos3/inc/Lth_font.h
  9. 0
      lithos_c/lithos3/inc/Lth_hashmap.h
  10. 0
      lithos_c/lithos3/inc/Lth_linklist.h
  11. 0
      lithos_c/lithos3/inc/Lth_manifest.h
  12. 0
      lithos_c/lithos3/inc/Lth_stdfix.h
  13. 0
      lithos_c/lithos3/inc/Lth_stdlib.h
  14. 0
      lithos_c/lithos3/inc/Lth_token.h
  15. 0
      lithos_c/lithos3/inc/Lth_tokenstream.h
  16. 0
      lithos_c/lithos3/inc/Lth_types.h
  17. 0
      lithos_c/lithos3/inc/Lth_window.h
  18. 0
      lithos_c/lithos3/inc/Lth_winman.h
  19. 0
      lithos_c/lithos3/src/context.c
  20. 0
      lithos_c/lithos3/src/control.c
  21. 0
      lithos_c/lithos3/src/draw.c
  22. 0
      lithos_c/lithos3/src/fontnew.c
  23. 0
      lithos_c/lithos3/src/fontrun.c
  24. 0
      lithos_c/lithos3/src/manifest.c
  25. 0
      lithos_c/lithos3/src/stdlib.c
  26. 0
      lithos_c/lithos3/src/token.c
  27. 0
      lithos_c/lithos3/src/tokenstream.c
  28. 0
      lithos_c/lithos3/src/window.c
  29. 0
      lithos_c/lithos3/src/winman.c
  30. 100
      lithos_c/src/main.c
  31. 1
      loadacs.txt

15
lithos_c/Makefile → 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

0
lithos_c/inc/Lth.h → lithos_c/lithos3/inc/Lth.h

0
lithos_c/inc/Lth_assert.h → lithos_c/lithos3/inc/Lth_assert.h

0
lithos_c/inc/Lth_callback.h → lithos_c/lithos3/inc/Lth_callback.h

0
lithos_c/inc/Lth_context.h → lithos_c/lithos3/inc/Lth_context.h

0
lithos_c/inc/Lth_control.h → lithos_c/lithos3/inc/Lth_control.h

0
lithos_c/inc/Lth_draw.h → lithos_c/lithos3/inc/Lth_draw.h

0
lithos_c/inc/Lth_font.h → lithos_c/lithos3/inc/Lth_font.h

0
lithos_c/inc/Lth_hashmap.h → lithos_c/lithos3/inc/Lth_hashmap.h

0
lithos_c/inc/Lth_linklist.h → lithos_c/lithos3/inc/Lth_linklist.h

0
lithos_c/inc/Lth_manifest.h → lithos_c/lithos3/inc/Lth_manifest.h

0
lithos_c/inc/Lth_stdfix.h → lithos_c/lithos3/inc/Lth_stdfix.h

0
lithos_c/inc/Lth_stdlib.h → lithos_c/lithos3/inc/Lth_stdlib.h

0
lithos_c/inc/Lth_token.h → lithos_c/lithos3/inc/Lth_token.h

0
lithos_c/inc/Lth_tokenstream.h → lithos_c/lithos3/inc/Lth_tokenstream.h

0
lithos_c/inc/Lth_types.h → lithos_c/lithos3/inc/Lth_types.h

0
lithos_c/inc/Lth_window.h → lithos_c/lithos3/inc/Lth_window.h

0
lithos_c/inc/Lth_winman.h → lithos_c/lithos3/inc/Lth_winman.h

0
lithos_c/src/context.c → lithos_c/lithos3/src/context.c

0
lithos_c/src/control.c → lithos_c/lithos3/src/control.c

0
lithos_c/src/draw.c → lithos_c/lithos3/src/draw.c

0
lithos_c/src/fontnew.c → lithos_c/lithos3/src/fontnew.c

0
lithos_c/src/fontrun.c → lithos_c/lithos3/src/fontrun.c

0
lithos_c/src/manifest.c → lithos_c/lithos3/src/manifest.c

0
lithos_c/src/stdlib.c → lithos_c/lithos3/src/stdlib.c

0
lithos_c/src/token.c → lithos_c/lithos3/src/token.c

0
lithos_c/src/tokenstream.c → lithos_c/lithos3/src/tokenstream.c

0
lithos_c/src/window.c → lithos_c/lithos3/src/window.c

0
lithos_c/src/winman.c → lithos_c/lithos3/src/winman.c

100
lithos_c/src/main.c

@ -1,100 +0,0 @@
//-----------------------------------------------------------------------------
//
// Copyright © 2016 Project Golan
//
// See "LICENSE" for more information.
//
//-----------------------------------------------------------------------------
//
// Program entry point.
//
//-----------------------------------------------------------------------------
#include "Lth.h"
#include <ACS_ZDoom.h>
#include <stdlib.h>
#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"<Graf> ɢ ᴜ ᴅ\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

1
loadacs.txt

@ -1,2 +1 @@
lithos3l
lithos3

Loading…
Cancel
Save