Fixes for mingw

12 files changed, 122 insertions, 142 deletions

diff --git a/wrapper-icon/Icon.rc b/MINGW32/Icon.rc
index 7e45ea3..7e45ea3 100644..100755
--- a/wrapper-icon/Icon.rc
+++ b/MINGW32/Icon.rc
diff --git a/wrapper-icon/Makefile.win b/MINGW32/Makefile.mingw32
index 05bdd53..3349abc 100644..100755
--- a/wrapper-icon/Makefile.win
+++ b/MINGW32/Makefile.mingw32
@@ -1,36 +1,36 @@
-CPP  = g++.exe

-CC   = i686-w64-mingw32-g++ 

-

-WINDRES = i686-w64-mingw32-windres

-RES  = 

-OBJ  =  wrapper.o $(RES)

-LINKOBJ  = wrapper.o $(RES)

-#LIBS =  -L"/lib" -lsdl -lsdl_ttf -mwindows

-LIBS = -static-libgcc

-INCS = 

-CXXINCS =

-BIN  = wrapper.exe

-CXXFLAGS = $(CXXINCS) -g

-CFLAGS = $(INCS)

-RM = rm

-

-.PHONY: all all-before all-after clean clean-custom

-

-all: all-before wrapper.exe all-after 

-

-

-clean: clean-custom

-	${RM} $(OBJ)

-	${RM} $(BIN)

-

-	$(WINDRES)  Icon.rc Icon.res

-

-

-$(BIN): $(OBJ)

-	$(WINDRES) Icon.rc -O coff -o icon.o

-	$(CC) $(LINKOBJ) -o "wrapper.exe" $(LIBS) icon.o

-

-wrapper.o: wrapper.c

-	$(CC) -c wrapper.c -o wrapper.o $(CFLAGS) -DNO_STDIO_REDIRECT

-

-

+CPP  = i686-w64-mingw32-g++
+CC   = i686-w64-mingw32-gcc
+
+WINDRES = i686-w64-mingw32-windres
+RES  = 
+OBJ  =  wrapper.o $(RES)
+LINKOBJ  = wrapper.o $(RES)
+#LIBS =  -L"/lib" -lsdl -lsdl_ttf -mwindows
+LIBS = -static-libgcc
+INCS = 
+CXXINCS =
+BIN  = colorsmemory.exe
+CXXFLAGS = $(CXXINCS) -g
+CFLAGS = $(INCS)
+RM = rm
+
+.PHONY: all all-before all-after clean clean-custom
+
+all: all-before colorsmemory.exe all-after 
+
+
+clean: clean-custom
+	${RM} $(OBJ)
+	${RM} $(BIN)
+
+	${RM}  icon.o
+
+
+$(BIN): $(OBJ)
+	$(WINDRES) Icon.rc -O coff -o icon.o
+	$(CC) $(LINKOBJ) -o "colorsmemory.exe" $(LIBS) -mwindows icon.o
+
+wrapper.o: wrapper.c
+	$(CC) -c wrapper.c -o wrapper.o $(CFLAGS) -DNO_STDIO_REDIRECT
+
+
diff --git a/wrapper-icon/icon/Jttt.ico b/MINGW32/icon/Jttt.ico
index c5e9ee6..c5e9ee6 100644
--- a/wrapper-icon/icon/Jttt.ico
+++ b/MINGW32/icon/Jttt.ico
diff --git a/wrapper-icon/icon/Trefle.ico b/MINGW32/icon/Trefle.ico
index c753797..c753797 100644
--- a/wrapper-icon/icon/Trefle.ico
+++ b/MINGW32/icon/Trefle.ico
diff --git a/wrapper-icon/icon/colorsmemory.ico b/MINGW32/icon/colorsmemory.ico
index eb2475a..eb2475a 100644
--- a/wrapper-icon/icon/colorsmemory.ico
+++ b/MINGW32/icon/colorsmemory.ico
diff --git a/wrapper-icon/icon/ufo-small.ico b/MINGW32/icon/ufo-small.ico
index 44ed689..44ed689 100644
--- a/wrapper-icon/icon/ufo-small.ico
+++ b/MINGW32/icon/ufo-small.ico
diff --git a/MINGW32/wrapper.c b/MINGW32/wrapper.c
new file mode 100755
index 0000000..3d6fbe6
--- /dev/null
+++ b/MINGW32/wrapper.c
@@ -0,0 +1,84 @@
+#include <windows.h>

+#include <stdio.h>

+#include <tchar.h>

+#include <stdlib.h>  // exit

+#include <unistd.h>  // sleep  access

+

+char * file_exist(){

+    char * name = (char *)".\\config.txt";

+	//char *file = current(name);

+	char *file = name;

+

+	if (access(file, F_OK)==0){

+		printf("PLIK istnieje %s\n",file);

+		//free(file);

+		return file;

+	}

+	printf("PLIK nie istnieje %s\n",file);

+	//free(file);

+	return NULL;

+}

+

+

+

+

+void main( int argc, TCHAR *argv[] )

+{

+    STARTUPINFO si;

+    PROCESS_INFORMATION pi;

+

+	char * file = file_exist();

+	char bufor1[128];

+    char bufor2[128];

+    char bufor3[128];

+    char run[384];

+

+	if (!file) exit(1);

+

+	FILE * f = fopen(file, "r");

+	fscanf(f, "%s %s %s", bufor1,bufor2,bufor3);

+	fclose(f);

+    strcpy(run, bufor1);

+    strcat(run, " ");

+    strcat(run, bufor2);

+    strcat(run, " ");

+    strcat(run, bufor3);

+    printf("Uruchamiam %s \n",run);

+    //free(file);

+

+

+    ZeroMemory( &si, sizeof(si) );

+    si.cb = sizeof(si);

+    ZeroMemory( &pi, sizeof(pi) );

+

+    //if( argc != 2 )

+    //{

+    //    printf("Usage: %s [cmdline]\n", argv[0]);

+   //    return;

+    //}

+

+    // Start the child process. 

+    if( !CreateProcess( NULL,   // No module name (use command line)

+        run,        // Command line

+        NULL,           // Process handle not inheritable

+        NULL,           // Thread handle not inheritable

+        FALSE,          // Set handle inheritance to FALSE

+        0,              // No creation flags

+        NULL,           // Use parent's environment block

+        NULL,           // Use parent's starting directory 

+        &si,            // Pointer to STARTUPINFO structure

+        &pi )           // Pointer to PROCESS_INFORMATION structure

+    ) {}

+    else

+    {

+        printf( "CreateProcess failed (%d).\n", GetLastError() );

+        return;

+    }

+

+    // Wait until child process exits.

+    WaitForSingleObject( pi.hProcess, INFINITE );

+

+    // Close process and thread handles. 

+    CloseHandle( pi.hProcess );

+    CloseHandle( pi.hThread );

+}

diff --git a/VERSION b/VERSION
new file mode 100644
index 0000000..8e084bb
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+0.210503-3
diff --git a/src/ColorsMemory.java b/src/ColorsMemory.java
index 271ddd2..4fb86c0 100644
--- a/src/ColorsMemory.java
+++ b/src/ColorsMemory.java
@@ -206,7 +206,7 @@ public class ColorsMemory extends JPanel
 

             JOptionPane.showMessageDialog(frame,

                     "Moja implementacja gry Memory\nPrzemysław R. Pietraszczyk\nStworzono w oparciu o OpenJDK\nSierpien 2019",

-                    "Colors Memory 0.210503-0",

+                    "Colors Memory 0.210503-3",

                     JOptionPane.PLAIN_MESSAGE);

 

         }

diff --git a/wrapper-icon/Makefile.old.win b/wrapper-icon/Makefile.old.win
deleted file mode 100644
index 107331f..0000000
--- a/wrapper-icon/Makefile.old.win
+++ /dev/null
@@ -1,33 +0,0 @@
-CPP  = g++.exe

-CC   = gcc.exe

-

-WINDRES = windres.exe

-RES  = 

-OBJ  =  wrapper.o $(RES)

-LINKOBJ  = wrapper.o $(RES)

-#LIBS =  -L"/lib" -lsdl -lsdl_ttf -mwindows

-LIBS = -static-libgcc

-INCS = 

-CXXINCS =

-BIN  = wrapper.exe

-CXXFLAGS = $(CXXINCS) -g

-CFLAGS = $(INCS)

-RM = rm

-

-.PHONY: all all-before all-after clean clean-custom

-

-all: all-before wrapper.exe all-after 

-

-

-clean: clean-custom

-	${RM} $(OBJ)

-	${RM} $(BIN)

-

-

-$(BIN): $(OBJ)

-	$(CC) $(LINKOBJ) -o "wrapper.exe" $(LIBS)

-

-wrapper.o: wrapper.c

-	$(CC) -c wrapper.c -o wrapper.o $(CFLAGS) -DNO_STDIO_REDIRECT

-

-

diff --git a/wrapper-icon/config.txt b/wrapper-icon/config.txt
deleted file mode 100644
index 3618f18..0000000
--- a/wrapper-icon/config.txt
+++ /dev/null
@@ -1 +0,0 @@
-.\jre\bin\javaw.exe -jar ColorsMemory.jar
diff --git a/wrapper-icon/wrapper.c b/wrapper-icon/wrapper.c
deleted file mode 100644
index 5ea19f8..0000000
--- a/wrapper-icon/wrapper.c
+++ /dev/null
@@ -1,71 +0,0 @@
-#include <stdio.h>   // printf

-#include <stdlib.h>  // exit

-#include <string.h>

-#include <unistd.h>  // sleep  access

-

-/*

-char * current(char * name){

-    char *file;

-

-    if (!getenv("CD")) {

-        printf ("Zmienna srodowiskowa \"CD\" nie istnieje !\n");   

-        exit (1);

-    }

-	file=malloc(strlen(getenv("CD")+strlen(name)+1));

-	strcpy(file, getenv("CD"));

-	strcat(file, name);

-

-    return file;

-}

-*/

-

-char * file_exist(){

-    char * name = (char *)".\\config.txt";

-	//char *file = current(name);

-	char *file = name;

-

-	if (access(file, F_OK)==0){

-		printf("PLIK istnieje %s\n",file);

-		free(file);

-		return file;

-	}

-	printf("PLIK nie istnieje %s\n",file);

-	free(file);

-	return NULL;

-}

-

-

-

-void load(){

-	

-    char * file = file_exist();

-    char bufor1[128];

-    char bufor2[128];

-    char bufor3[128];

-    char run[384];

-

-    if (!file) exit(1);

-

-	FILE * f = fopen(file, "r");

-	fscanf(f, "%s %s %s", bufor1,bufor2,bufor3);

-	fclose(f);

-    strcpy(run, bufor1);

-    strcat(run, " ");

-    strcat(run, bufor2);

-    strcat(run, " ");

-    strcat(run, bufor3);

-    printf("Uruchamiam %s \n",run);

-    free(file);

-    

-    system(run);

-	

-

-	

-

-}

-

-int main (){

-    load();

-

-    return 0;

-}