config dl gimxfile rebase

.gitignore

@@ -57,3 +57,5 @@ fpsconfig/gimx-fpsconfig
 core/gimx
 core/test/haptic/ff_lg_test
 loader/gimx-loader
+
+.vscode

Makedefs

@@ -26,6 +26,11 @@ CXXFLAGS += -pg
 LDFLAGS += -pg
 endif
 
+#Library address sanitiser is not available for mingw64. This applies to msys2.
+#Uncomment below lines, and comment above lines, for plain debug symbols.
+#CFLAGS += -Wall -Wextra -Werror -O0 -g
+#CXXFLAGS += -Wall -Wextra -Werror -O0 -g
+
 CPPFLAGS += -I../shared
 
 GIMXFILE_LDFLAGS = $(GIMXLOG_LDFLAGS) -L../shared/gimxfile

Makefile

@@ -1,4 +1,5 @@
-DIRS = shared utils core config launcher fpsconfig loader
+DIRS = shared utils core config launcher fpsconfig loader fetchconfig
+
 
 ifneq ($(OS),Windows_NT)
 DIRS+= po
@@ -19,13 +20,14 @@ build-core: build-shared
 build-config: build-shared
 build-launcher: build-shared
 build-fpsconfig: build-shared
+build-fetchconfig: build-shared
 
 clean: $(CLEANDIRS)
-$(CLEANDIRS): 
+$(CLEANDIRS):
 	$(MAKE) -C $(@:clean-%=%) clean
 
 ifeq ($(OS),Windows_NT)
-DLLS = $(shell ntldd -R {core,config,fpsconfig,launcher}/*.exe | grep mingw | sed "s/.*=> //g" | cut -d' ' -f 1 | sed 's/\\/\\\\/g' | xargs cygpath -u | sort | uniq)\
+DLLS = $(shell ntldd -R {core,config,fpsconfig,launcher,fetchconfig}/*.exe | grep mingw | sed "s/.*=> //g" | cut -d' ' -f 1 | sed 's/\\/\\\\/g' | xargs cygpath -u | sort | uniq)\
 	   $(shell ntldd -R shared/*/*.dll | grep mingw | sed "s/.*=> //g" | cut -d' ' -f 1 | sed 's/\\/\\\\/g' | xargs cygpath -u | sort | uniq)
 install: all
 	mkdir -p setup
@@ -36,6 +38,7 @@ install: all
 	cp -u -f core/gimx setup/gimx.exe
 	cp -u -f config/gimx-config setup/gimx-config.exe
 	cp -u -f launcher/gimx-launcher setup/gimx-launcher.exe
+	cp -u -f fetchconfig/gimx-fetchconfig setup/gimx-fetchconfig.exe
 	cp -u -f fpsconfig/gimx-fpsconfig setup/gimx-fpsconfig.exe
 	cp -u -f loader/gimx-loader setup/gimx-loader.exe
 	cp -u -f shared/gimxinput/src/windows/gamecontrollerdb.txt setup

core/macros.c

@@ -304,7 +304,7 @@ static int get_macro(char tokens[MAX_LINE_TOKENS][LINE_MAX], int ntoks)
   if(ntoks < 2) {
     return -1;
   }
-  
+
   pcurrent = NULL;
 
   if(ntoks > 2)
@@ -460,19 +460,19 @@ static int get_event(char tokens[MAX_LINE_TOKENS][LINE_MAX], int ntoks)
   int rvalue;
   int delay_nb;
   int i;
-  
+
   if(!pcurrent || ntoks < 2) {
     return -1;
   }
-  
+
   int ret = 0;
-  
+
   if (!strncmp(tokens[0], "KEYDOWN", strlen("KEYDOWN")))
   {
     rbutton = ginput_key_id(tokens[1]);
 
     ALLOCATE_EVENT_OR_FAIL
-    
+
     pcurrent->events[pcurrent->nb_events - 1].type = GE_KEYDOWN;
     pcurrent->events[pcurrent->nb_events - 1].key.keysym = rbutton;
   }
@@ -490,7 +490,7 @@ static int get_event(char tokens[MAX_LINE_TOKENS][LINE_MAX], int ntoks)
     rbutton = ginput_key_id(tokens[1]);
 
     ALLOCATE_EVENT_OR_FAIL
-    
+
     pcurrent->events[pcurrent->nb_events - 1].type = GE_KEYDOWN;
     pcurrent->events[pcurrent->nb_events - 1].key.keysym = rbutton;
 
@@ -501,7 +501,7 @@ static int get_event(char tokens[MAX_LINE_TOKENS][LINE_MAX], int ntoks)
     }
 
     ALLOCATE_EVENT_OR_FAIL
-    
+
     pcurrent->events[pcurrent->nb_events - 1].type = GE_KEYUP;
     pcurrent->events[pcurrent->nb_events - 1].key.keysym = rbutton;
   }
@@ -510,7 +510,7 @@ static int get_event(char tokens[MAX_LINE_TOKENS][LINE_MAX], int ntoks)
     rbutton = ginput_mouse_button_id(tokens[1]);
 
     ALLOCATE_EVENT_OR_FAIL
-    
+
     pcurrent->events[pcurrent->nb_events - 1].type = GE_MOUSEBUTTONDOWN;
     pcurrent->events[pcurrent->nb_events - 1].button.button = rbutton;
   }
@@ -646,12 +646,12 @@ int get_trigger(char tokens[MAX_LINE_TOKENS][LINE_MAX], int ntoks)
 {
   int etype = -1;
   int rbutton;
-  
+
   if(!pcurrent || ntoks < 2)
   {
     return -1;
   }
-  
+
   if(ntoks > 2)
   {
     if(!strncmp(tokens[1], "KEYDOWN", strlen("KEYDOWN")))
@@ -1386,4 +1386,3 @@ unsigned int macro_process()
   }
   return running_macro_nb;
 }
-

fetchconfig/Makefile

@@ -0,0 +1,70 @@
+include ../Makedefs
+
+
+ifneq ($(OS),Windows_NT)
+prefix=$(DESTDIR)/usr
+bindir=$(prefix)/bin
+endif
+
+
+NAME=$(shell basename "$(shell pwd)")
+
+
+ifneq ($(OS),Windows_NT)
+LDLIBS += -lstdc++ -lm `pkg-config --libs ncursesw`
+else
+LDLIBS += -lws2_32 -lstdc++ -lpdcursesw -lintl
+endif
+
+CPPFLAGS += -Iinclude -std=c++14
+
+LDFLAGS += -L../shared/gimxfetchconfig
+LDLIBS  += -lgimxfetchconfig
+LDFLAGS += $(GIMXINPUT_LDFLAGS)   $(GIMXUSB_LDFLAGS) $(GIMXPOLL_LDFLAGS)
+LDLIBS  += $(GIMXINPUT_LDLIBS)    $(GIMXUSB_LDLIBS)  $(GIMXPOLL_LDLIBS)
+LDLIBS  += $(GIMXUPDATER_LDLIBS)  $(GIMXCONFIGUPDATER_LDLIBS)
+LDFLAGS += $(GIMXUPDATER_LDFLAGS) $(GIMXCONFIGUPDATER_LDFLAGS)
+
+
+OBJECTS := $(patsubst %.cpp,%.o,$(wildcard *.cpp))
+
+OUT=gimx-$(NAME)
+
+ifneq ($(OS),Windows_NT)
+BINS = $(OUT)
+else
+OBJECTS += $(NAME).rc.o
+endif
+
+
+all: $(OUT)
+
+
+$(OUT): $(OBJECTS)
+
+ifeq ($(OS),Windows_NT)
+$(NAME).rc.o: $(NAME).rc
+  WINDRES $^ -o $@
+endif
+
+
+clean:
+	$(RM) $(OBJECTS) $(OUT)
+
+.PHONY: clean
+
+
+ifneq ($(OS),Windows_NT)
+install: all
+	mkdir -p $(prefix)
+	mkdir -p $(bindir)
+	for i in $(BINS); do cp $$i $(bindir)/; done
+	for i in $(BINS); do chmod ug+s $(bindir)/$$i; done
+
+uninstall:
+	-for i in $(BINS); do $(RM) $(bindir)/$$i; done
+	-rmdir $(bindir)
+	-rmdir $(prefix)
+
+really-clean: clean uninstall
+endif