From f537b29d86d135446afcad633c7497ee7d0d524a Mon Sep 17 00:00:00 2001 From: Matthew Owens Date: Thu, 1 Oct 2020 13:36:39 +0100 Subject: [PATCH] initial commit --- .gitignore | 2 ++ .gitmodules | 6 ++++++ Makefile | 37 +++++++++++++++++++++++++++++++++++++ clogs | 1 + src/main.c | 10 ++++++++++ src/main.o | Bin 0 -> 3696 bytes vector | 1 + 7 files changed, 57 insertions(+) create mode 100644 .gitignore create mode 100644 .gitmodules create mode 100644 Makefile create mode 160000 clogs create mode 100644 src/main.c create mode 100644 src/main.o create mode 160000 vector diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2e4059b --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +pong +*.exe diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..313b5b1 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "vector"] + path = vector + url = git@owens.tech:cecse/vector.git +[submodule "clogs"] + path = clogs + url = git@owens.tech:cecse/clogs.git diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..be9e688 --- /dev/null +++ b/Makefile @@ -0,0 +1,37 @@ +TARGET = pong +LIBS = -lm -D_REENTRANT -lGL -lGLEW -lSDL2 -lSDL2_image -pthread + +CC = gcc +CFLAGS = -g -Wall -I/usr/include/SDL2 -Isrc + +.PHONY: default all clean + +default: $(TARGET) +all: default + +MODULES := vector clogs +export VECTOR_DIR=vector/src +export CLOG_DIR=clogs/src + +include $(patsubst %, %/module.mk, $(MODULES)) + +CFLAGS += -I$(VECTOR_DIR) -I$(CLOG_DIR) + +#OBJ += $(patsubst src/%.c, src/%.o, $(wildcard src/*.c)) +HEADERS += $(wildcard src/*.h) +SRC += $(wildcard src/*.c) +OBJ := $(SRC:.c=.o) + +.PRECIOUS: $(TARGET) $(OBJ) + +$(TARGET): $(OBJ) + $(CC) $(OBJ) -Wall $(LIBS) -o $@ + -./$(TARGET) + +clean: + rm -f src/*.o + rm -f $(TARGET) + +output: + @echo "SRC: $(SRC)" + @echo "OBJ: $(OBJ)" diff --git a/clogs b/clogs new file mode 160000 index 0000000..8020a1e --- /dev/null +++ b/clogs @@ -0,0 +1 @@ +Subproject commit 8020a1e5b08b570e4ac20837cc67a0e8da6700a0 diff --git a/src/main.c b/src/main.c new file mode 100644 index 0000000..0c0ce22 --- /dev/null +++ b/src/main.c @@ -0,0 +1,10 @@ +#include +#include "clogs.h" +#include "vector.h" + +int main() +{ + printf("hello, world\n"); + COUT("TEST"); + return 0; +} diff --git a/src/main.o b/src/main.o new file mode 100644 index 0000000000000000000000000000000000000000..afd1b90efa12f82506cda7327db9c4ca1630051b GIT binary patch literal 3696 zcmbVOdu&r>6hF6j-K(s0j0s}{YXS`7EMrW0EY3Y#x8i`g2bRUrwQFIxZiTkY;&X&W za7tvn9C6?y0f{jYOh62Yj4fuy$cT?9_y9uC_?Hd{5|jkbx%WF=`RM-PB)#XH-+6rB zJ?DJi?W+~lc7vh-lLEysrZEbTpE4$wXkrOu!enTudj0pR?T-`kCq1gRXX@-xVyEbF zf*zVtlbVKFeSUu+&-#2I==VZ>MO{6#yVrG)7ev<{)zzpT>3?x(U|?Vn3^{LFcWzbE z`m9IyEjo94vZ>p11?sA6W@L8{r+(14%DLeB(ynRF-Yd@9%?Zw~{YG!zt|h+|T8(?R z?5J6A>0j$Vn^Wv7e_Wq8;^_~Wu5? zGfb*E+nlaUO0rA=Fw6v#sTd&uRfx#|3A4eG0boo}RCBS(WO8IIF%_8>n-l~S=YVR? zF##mmlqa%Ovu<%@P{xv}d&{!ODY+1x92tdKhN%E4isHy1H1#1&I}byNxF`9#8r38H z-@BWen?0bI6TQuYUDE-~=b)_--Bfst0+s*FY53H7j9HXWumxKDfwiG|Bx$9$wNO3{ zw6%f(ql^lq5Z7pm(eTtsV@mQ#qq53iz+8y(ex?h7^++>Cs!EF4Mp|9a+_^P_E_d+iA?{oQxb zcOidbQP5s-{K@lq`#)T;yYF1%(Y=GIpF}<@IQ!0x(4O2|hFOy?d{dKKI5K=H*M9!p z#`4n^=_+*t&B%1W{O8D81I2; zPYU9bgeBHPg~WUO2~Z*ao2U?T8N@`YAci#t)AOWBh_0$IaU9$-4vyzeB0QA%PCR|0 z7l=`B;$rJ| zeG)FzXn(j4^}=va^5^;<5xCr!VaZ?nOe6MfjK2|Onjxat`QaHR+(Hi|Ie&!?--BBP zPBRiaCtwS0Y7e_T$iqRMx3U!U`Q5g#FA@fu*By3)%@YcNEf~-h&Fb}eHm-H8>sS*& zA5C_9JV9S4x>2xzg6@vBJ_;Sf{OdY=9D?hCttHUj?(4v%Is##z4L<{qgu?EYHWB1& zb*%}y+kN6K?w?sPlxoIx*t|?a^7$Je2k@>cg+CmyguFMu_Uig_ko7-iwS2wPjAEqqb#|> zV#MOr?~>Y(SZ4 zk*GW0LpnMZ&->Vh1}&Z)1WyqI$=^*ja~$(t5zlt!Ir2aY1IMx7AruIc=hrIY7qO$@ z(rd!|h{vm6t8k31AKkGW&v?AGX(^{z|0}U!sssJIlH+M6;=QU>%zr7`V@afoLg^^Q Pi|-N(9f^ACf*k)p(MMbw literal 0 HcmV?d00001 diff --git a/vector b/vector new file mode 160000 index 0000000..4f99e38 --- /dev/null +++ b/vector @@ -0,0 +1 @@ +Subproject commit 4f99e3836438b7a36da9a9da77d80e3d11b6d3b2 -- 2.20.1