test package of config.txt

.gitlab-ci.yml

@@ -21,9 +21,12 @@ package-ubuntu-x:
   tags:
     - ubuntu
   stage: package
+  script:
+    - cp config.txt ..
   artifacts:
     paths:
       - gsplusx
+      - config.txt
 
 
 build-ubuntu-sdl:

config.template

@@ -1,9 +0,0 @@
-# GSport configuration file
-
-s5d1 =
-s5d2 =
-
-s6d1 =
-s6d2 = 
-
-s7d1 = NoBoot.po

src/Makefile

@@ -1,11 +1,11 @@
-# GSport central makefile - you need a 'vars' file linked/copied from a 'vars_xxx' template to build.
+# GSplus central makefile - you need a 'vars' file linked/copied from a 'vars_xxx' template to build.
 #@todo: check for vars file and do something useful if missing :P
 #@todo: remove all packaging junk and move to packaging scripts in CI
 OBJECTS1 = adb.o clock.o config.o debug.o dis.o engine_c.o scc.o iwm.o \
-	joystick_driver.o moremem.o paddles.o parallel.o printer.o \
-	sim65816.o smartport.o sound.o sound_driver.o video.o \
-	scc_socket_driver.o imagewriter.o scc_imagewriter.o scc_llap.o
-ATOBJ = atbridge/aarp.o atbridge/atbridge.o atbridge/elap.o atbridge/llap.o atbridge/port.o 
+	joystick_driver.o moremem.o paddles.o parallel.o printer.o sim65816.o \
+	smartport.o sound.o sound_driver.o video.o scc_socket_driver.o \
+	imagewriter.o scc_imagewriter.o scc_llap.o
+ATOBJ = atbridge/aarp.o atbridge/atbridge.o atbridge/elap.o atbridge/llap.o atbridge/port.o
 PCAPOBJ = atbridge/pcap_delay.o
 TFEOBJ = tfe/tfe.o tfe/tfearch.o tfe/tfesupp.o
 
@@ -50,7 +50,6 @@ gsplusfb: $(OBJECTS) compile_time.o
 	$(LD) $(CCOPTS) $(LDOPTS) $(OBJECTS) compile_time.o $(LDFLAGS) -o $(NAME)$(SUFFIX) $(EXTRA_LIBS)
 	echo $(OBJECTS)
 	mv gsplusfb ..
-	cp -f ../config.template ../config.txt
 
 # Mingw32 / Cygwin builds:  The Win32 API version
 gsplus32.exe: $(OBJECTS) compile_time.o