Makefile

@@ -60,7 +60,6 @@ help:
 	echo "set up configuration"
 	echo "   make configlinux      to generate the linix build"
 	echo "   make configcross      to generate the windows build using cross tools."
-	echo "   make configwindows    to generate the windows build using msys2."
 	echo " "
 	echo "   make checkdumpfile    to create a test tool for videodumps."
 

Makefile.rules.windows

@@ -1,12 +0,0 @@
-
-include Makefile.config
-
-TARGET = $(APP).exe
-CPP = g++
-CPPFLAGS = -ggdb -Wall -O0 `pkg-config --cflags gtk+-3.0 gmodule-export-2.0` -Wl,--export-dynamic -DBUILD_WINDOWS=1 -Wdeprecated
-INCLUDES = 
-LDFLAGS = -lws2_32 -ljpeg 
-LIBS = `pkg-config --libs gtk+-3.0 gmodule-export-2.0` -L/usr/lib -mwindows
-
-OBJECTS := $(OBJECTS) windows.oo
-

configuration.cc

@@ -222,7 +222,7 @@ void Configuration::LoadConfig(std::string filename) {
 
 		posctl.LockMutex();
 		for (i = 0; i < 2; i++) {
-			if (jp.GetObjectJson("posctl_axis"+to_string(i), &jaxis)) {
+			if (jp.GetObject("posctl_axis"+to_string(i), &jaxis)) {
 				jaxis.GetValueDouble("min", &amin);
 				jaxis.GetValueDouble("max", &amax);
 				jaxis.GetValueDouble("kp", &akp);

json.cc

@@ -232,7 +232,7 @@ int JSONParse::GetValueInt64(string varname, int64_t *dest) {
 };
 
 
-int JSONParse::GetObjectJson(string varname, JSONParse *dest) {
+int JSONParse::GetObject(string varname, JSONParse *dest) {
 	list<JSONElement>::iterator iter;
 
 	if (dest == NULL) return 0;

json.h

@@ -56,7 +56,7 @@ public:
 	int GetValueInt(string varname, int *dest);
 	int GetValueDouble(string varname, double *dest);
 	int GetValueInt64(string varname, int64_t *dest);
-	int GetObjectJson(string varname, JSONParse *dest);
+	int GetObject(string varname, JSONParse *dest);
 
 	int GetIdx(string src, int idx, string *dest);
 	int GetValueIdx(string varname, int idx, string *dest);