Add klystron as a git submodule (kometbomb#245)

Author: kometbomb

.circleci/config.yml

@@ -5,10 +5,10 @@ jobs:
       - image: gcc:8
     steps:
       - run: apt-get update && apt-get install -y zip libsdl2-dev libsdl2-image-dev
-      - run: git clone https://github.com/kometbomb/klystron.git
-      - run: git clone https://github.com/kometbomb/klystrack.git && cd klystrack && git checkout $CIRCLE_BRANCH
-      - run: cd klystrack && make CC=gcc CFG=release RES_PATH=.
-      - run: cd klystrack && zip -j /tmp/klystrack-linux64.zip bin.release/klystrack doc/Default.kt && zip -r /tmp/klystrack-linux64.zip res key examples LICENSE doc/SDL.txt doc/SDL_image.txt
+      - checkout
+      - run: git submodule init && git submodule update --remote
+      - run: make CC=gcc CFG=release RES_PATH=.
+      - run: zip -j /tmp/klystrack-linux64.zip bin.release/klystrack doc/Default.kt && zip -r /tmp/klystrack-linux64.zip res key examples LICENSE doc/SDL.txt doc/SDL_image.txt
       #- run: cd klystrack && make clean
       #- run: SDL_ROOT_DIR=/usr/x86_64-win32-mingw32 COMSPEC=1 && cd klystrack && make CC=x86_64-win32-mingw32-gcc CFG=release RES_PATH=.
       #- run: cd klystrack && zip -j /tmp/klystrack-win32.zip bin.release/klystrack doc/Default.kt && zip -r /tmp/klystrack-win32.zip res key examples LICENSE doc/SDL.txt doc/SDL_image.txt

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "klystron"]
+	path = klystron
+	url = https://github.com/kometbomb/klystron.git

Makefile

@@ -1,5 +1,5 @@
 TARGET := klystrack
-KLYSTRON=../klystron
+KLYSTRON=klystron
 ECHO := echo
 CFG := debug
 MACHINE :=
@@ -19,7 +19,7 @@ SDL_IMAGEVER := 2.0.3
 THEMES :=
 REV := cp -f
 
-CFLAGS := $(MACHINE) -ftree-vectorize -std=gnu99 --no-strict-aliasing -Werror
+CFLAGS := $(MACHINE) -ftree-vectorize -std=gnu99 -Wno-strict-aliasing -Werror
 
 ifdef COMSPEC
 	TARGET := $(TARGET).exe
@@ -46,7 +46,7 @@ else
 	CONFIG_PATH := ~/.klystrack
 endif
 
-EXTFLAGS := -DNOSDL_MIXER -DUSESDLMUTEXES -DENABLEAUDIODUMP -DSTEREOOUTPUT -DUSESDL_IMAGE $(EXTFLAGS)
+EXTFLAGS := -DNOSDL_MIXER -DUSESDLMUTEXES -DENABLEAUDIODUMP -DSTEREOOUTPUT -DUSESDL_IMAGE $(EXTFLAGS) $(CFLAGS)
 LDFLAGS :=  -L $(KLYSTRON)/bin.$(CFG) -lengine_gfx -lengine_util -lengine_snd -lengine_gui -lm $(SDLLIBS)
 INCLUDEFLAGS := -I src $(SDLFLAGS) -I $(KLYSTRON)/src -L$(KLYSTRON)/bin.$(CFG) -DRES_PATH="$(RES_PATH)" -DCONFIG_PATH="$(CONFIG_PATH)" $(EXTFLAGS) -DKLYSTRON=$(KLYSTRON)
 
@@ -77,6 +77,8 @@ else
  endif
 endif
 
+CFLAGS += -Wno-strict-aliasing
+
 # $(1) = subdir, $(2) = filename prefix (i.e. subdir without a slash)
 define directory_defs
  SRC := $$(notdir $$(wildcard src/$(value 1)/*$(EXT)))
@@ -200,6 +202,7 @@ nightly: zip
 	@cp zip/$(ARCHIVE) zip/klystrack-nightly-`date +"%Y%m%d" | tr -d '\n'`-win32.zip
 
 clean:
+	make -C klystron clean
 	@rm -rf deps objs.debug objs.release objs.profile bin.release bin.debug bin.profile zip temp res
 
 bin.$(CFG)/$(TARGET): $(OBJS)