From b60b0c7de39f0150748ee2fac85838ce4c94c896 Mon Sep 17 00:00:00 2001 From: "BADIM-PC\\Vadim" Date: Wed, 14 Feb 2018 15:16:33 +0300 Subject: [PATCH] main renamed to system --- Makefile | 8 ++++---- build/windows/tic/tic.vcxproj | 2 +- build/windows/tic/tic.vcxproj.filters | 6 +++--- src/studio.h | 2 +- src/{main.c => system.c} | 2 +- src/{main.h => system.h} | 0 6 files changed, 10 insertions(+), 10 deletions(-) rename src/{main.c => system.c} (99%) rename src/{main.h => system.h} (100%) diff --git a/Makefile b/Makefile index ad7897a..5eca81f 100644 --- a/Makefile +++ b/Makefile @@ -244,7 +244,7 @@ bin/menu.o: src/menu.c $(TIC80_H) $(TIC_H) bin/surf.o: src/surf.c $(TIC80_H) $(TIC_H) $(CC) $< $(OPT) $(INCLUDES) -c -o $@ -bin/main.o: src/main.c src/keycodes.c $(TIC80_H) $(TIC_H) +bin/system.o: src/system.c src/keycodes.c $(TIC80_H) $(TIC_H) $(CC) $< $(OPT) $(INCLUDES) -c -o $@ SDL_NET = \ @@ -313,13 +313,13 @@ $(STUDIO_DLL): $(DEMO_ASSETS) $(TIC80_DLL) $(TIC_O) bin/html.o $(CC) $(TIC_O) bin/html.o $(TIC80_A) $(OPT) -shared $(INCLUDES) -L$(PRE_BUILT)/mingw -llua -lz -lgif -Wl,--out-implib,$(STUDIO_A) -o $@ emscripten: - $(EMS_CC) $(SOURCES) src/main.c $(TIC80_SRC) $(OPT) $(INCLUDES) $(EMS_OPT) $(EMS_LINKER_FLAGS) -o build/html/tic.js + $(EMS_CC) $(SOURCES) src/system.c $(TIC80_SRC) $(OPT) $(INCLUDES) $(EMS_OPT) $(EMS_LINKER_FLAGS) -o build/html/tic.js wasm: $(EMS_CC) $(SOURCES) $(TIC80_SRC) $(OPT) $(INCLUDES) $(EMS_OPT) -s WASM=1 $(EMS_LINKER_FLAGS) -o build/html/tic.js -mingw: $(STUDIO_DLL) $(SDL_NET) $(FILE_DIALOG) bin/main.o bin/res.o - $(CC) bin/main.o bin/res.o $(STUDIO_A) $(SDL_NET) $(FILE_DIALOG) $(OPT) $(INCLUDES) $(MINGW_LINKER_FLAGS) -o $(MINGW_OUTPUT) +mingw: $(STUDIO_DLL) $(SDL_NET) $(FILE_DIALOG) bin/system.o bin/res.o + $(CC) bin/system.o bin/res.o $(STUDIO_A) $(SDL_NET) $(FILE_DIALOG) $(OPT) $(INCLUDES) $(MINGW_LINKER_FLAGS) -o $(MINGW_OUTPUT) mingw-pro: $(eval OPT += $(OPT_PRO)) diff --git a/build/windows/tic/tic.vcxproj b/build/windows/tic/tic.vcxproj index c81aa64..3ef4913 100644 --- a/build/windows/tic/tic.vcxproj +++ b/build/windows/tic/tic.vcxproj @@ -50,8 +50,8 @@ - + diff --git a/build/windows/tic/tic.vcxproj.filters b/build/windows/tic/tic.vcxproj.filters index 32519de..dc1db77 100644 --- a/build/windows/tic/tic.vcxproj.filters +++ b/build/windows/tic/tic.vcxproj.filters @@ -24,15 +24,15 @@ src\ext\net - - src - src src\ext + + src + diff --git a/src/studio.h b/src/studio.h index e8f2cdc..f38c12f 100644 --- a/src/studio.h +++ b/src/studio.h @@ -36,7 +36,7 @@ #include "defines.h" #include "tools.h" #include "ext/file_dialog.h" -#include "main.h" +#include "system.h" #define TIC_LOCAL ".local/" #define TIC_CACHE TIC_LOCAL "cache/" diff --git a/src/main.c b/src/system.c similarity index 99% rename from src/main.c rename to src/system.c index 3c6ca00..b1eec29 100644 --- a/src/main.c +++ b/src/system.c @@ -1,4 +1,4 @@ -#include "main.h" +#include "system.h" #include "studio.h" #include "net.h" #include diff --git a/src/main.h b/src/system.h similarity index 100% rename from src/main.h rename to src/system.h