SU -> SDL_Universe renaming here and there

Semmu · Semmu · commit 3a753868d816 · 2017-01-05T22:04:56.000+01:00
diff --git a/include/SDL_Universe/SU.h b/include/SDL_Universe/SU.h
@@ -9,9 +9,9 @@
 
 #include <string>
 #include <list>
-#include "SU/SU_math.h"
-#include "SU/SU_etc.h"
-#include "SU/SU_primitives.h"
+#include "SDL_Universe/SU_math.h"
+#include "SDL_Universe/SU_etc.h"
+#include "SDL_Universe/SU_primitives.h"
 
 
 
diff --git a/include/SDL_Universe/SU_etc.h b/include/SDL_Universe/SU_etc.h
diff --git a/include/SDL_Universe/SU_math.h b/include/SDL_Universe/SU_math.h
diff --git a/include/SDL_Universe/SU_pixelmanip.h b/include/SDL_Universe/SU_pixelmanip.h
@@ -7,7 +7,7 @@
     #include <SDL2/SDL.h>
 #endif
 
-#include "SU/SU_etc.h"
+#include "SDL_Universe/SU_etc.h"
 
 void SDL_Surface_putpixel_nolock(SDL_Surface* s, int x, int y, int color);
 void SDL_Surface_putpixel_nolock(SDL_Surface* s, SDL_Point p, int c);
diff --git a/include/SDL_Universe/SU_primitives.h b/include/SDL_Universe/SU_primitives.h
diff --git a/makefile b/makefile
@@ -2,6 +2,8 @@
 #	VARIABLES AND SETTINGS
 #
 
+LIBNAME = SDL_Universe
+
 # compiler
 CC := g++
 # compilation flags
@@ -11,7 +13,7 @@ LFLAGS :=
 # source files
 SRCDIR := src
 SRCEXT := cpp
-SRCS := $(wildcard $(SRCDIR)/*.$(SRCEXT)) $(wildcard $(SRCDIR)/SU/*.$(SRCEXT))
+SRCS := $(wildcard $(SRCDIR)/*.$(SRCEXT)) $(wildcard $(SRCDIR)/$(LIBNAME)/*.$(SRCEXT))
 
 # building
 BUILDDIR := build
@@ -20,7 +22,7 @@ SDLVERSION := SDL
 
 # output
 OUTPUTDIR := bin
-TARGET := SDL_Universe
+TARGET := $(LIBNAME)
 
 
 
@@ -78,7 +80,7 @@ clean:
 	@echo -n "    "
 	$(RM) -r $(BUILDDIR)/*.o
 	@echo -n "    "
-	$(RM) -r $(BUILDDIR)/SU/*.o
+	$(RM) -r $(BUILDDIR)/$(LIBNAME)/*.o
 	@echo -n "    "
 	$(RM) -r $(OUTPUTDIR)/$(TARGET)
 
diff --git a/src/SDL_Universe/SU.cpp b/src/SDL_Universe/SU.cpp
@@ -1,6 +1,6 @@
-#include "SU/SU.h"
-#include "SU/SU_math.h"
-#include "SU/SU_pixelmanip.h"
+#include "SDL_Universe/SU.h"
+#include "SDL_Universe/SU_math.h"
+#include "SDL_Universe/SU_pixelmanip.h"
 #include <iostream>
 #include <algorithm>
 
diff --git a/src/SDL_Universe/SU_etc.cpp b/src/SDL_Universe/SU_etc.cpp
@@ -1,4 +1,4 @@
-#include "SU/SU_etc.h"
+#include "SDL_Universe/SU_etc.h"
 #include <cmath>
 #include <iostream>
 
diff --git a/src/SDL_Universe/SU_math.cpp b/src/SDL_Universe/SU_math.cpp
@@ -1,5 +1,5 @@
-#include "SU/SU_math.h"
-#include "SU/SU_etc.h"
+#include "SDL_Universe/SU_math.h"
+#include "SDL_Universe/SU_etc.h"
 #include <iostream>
 #include <sstream>
 
diff --git a/src/SDL_Universe/SU_pixelmanip.cpp b/src/SDL_Universe/SU_pixelmanip.cpp
@@ -1,4 +1,4 @@
-#include "SU/SU_pixelmanip.h"
+#include "SDL_Universe/SU_pixelmanip.h"
 #include <utility>
 
 void SDL_Surface_putpixel_nolock(SDL_Surface* s, int x, int y, int color)
diff --git a/src/SDL_Universe/SU_primitives.cpp b/src/SDL_Universe/SU_primitives.cpp
@@ -1,6 +1,6 @@
-#include "SU/SU_math.h"
-#include "SU/SU_primitives.h"
-#include "SU/SU.h"
+#include "SDL_Universe/SU_math.h"
+#include "SDL_Universe/SU_primitives.h"
+#include "SDL_Universe/SU.h"
 
 namespace SU
 {
diff --git a/src/main.cpp b/src/main.cpp
@@ -34,7 +34,7 @@
     #endif
 #endif
 
-#include "SU/SU.h"
+#include "SDL_Universe/SU.h"
 
 void DIE(const char* reason)
 {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "SU/SU_etc.h"`
	`1`	`+#include "SDL_Universe/SU_etc.h"`
`2`	`2`	`#include <cmath>`
`3`	`3`	`#include <iostream>`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "SU/SU_pixelmanip.h"`
	`1`	`+#include "SDL_Universe/SU_pixelmanip.h"`
`2`	`2`	`#include <utility>`
`3`	`3`
`4`	`4`	`void SDL_Surface_putpixel_nolock(SDL_Surface* s, int x, int y, int color)`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`		`-#include "SU/SU_math.h"`
`2`		`-#include "SU/SU_primitives.h"`
`3`		`-#include "SU/SU.h"`
	`1`	`+#include "SDL_Universe/SU_math.h"`
	`2`	`+#include "SDL_Universe/SU_primitives.h"`
	`3`	`+#include "SDL_Universe/SU.h"`
`4`	`4`
`5`	`5`	`namespace SU`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`#endif`
`35`	`35`	`#endif`
`36`	`36`
`37`		`-#include "SU/SU.h"`
	`37`	`+#include "SDL_Universe/SU.h"`
`38`	`38`
`39`	`39`	`void DIE(const char* reason)`
`40`	`40`	`{`