Fixes for mingw

9 files changed, 0 insertions, 142 deletions

diff --git a/wrapper-icon/Icon.rc b/wrapper-icon/Icon.rc
deleted file mode 100644
index 7e45ea3..0000000
--- a/wrapper-icon/Icon.rc
+++ /dev/null
@@ -1 +0,0 @@
-id ICON "icon/colorsmemory.ico"
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/Makefile.win b/wrapper-icon/Makefile.win
deleted file mode 100644
index 05bdd53..0000000
--- a/wrapper-icon/Makefile.win
+++ /dev/null
@@ -1,36 +0,0 @@
-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

-

-

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/icon/Jttt.ico b/wrapper-icon/icon/Jttt.ico
deleted file mode 100644
index c5e9ee6..0000000
--- a/wrapper-icon/icon/Jttt.ico
+++ /dev/null
diff --git a/wrapper-icon/icon/Trefle.ico b/wrapper-icon/icon/Trefle.ico
deleted file mode 100644
index c753797..0000000
--- a/wrapper-icon/icon/Trefle.ico
+++ /dev/null
diff --git a/wrapper-icon/icon/colorsmemory.ico b/wrapper-icon/icon/colorsmemory.ico
deleted file mode 100644
index eb2475a..0000000
--- a/wrapper-icon/icon/colorsmemory.ico
+++ /dev/null
diff --git a/wrapper-icon/icon/ufo-small.ico b/wrapper-icon/icon/ufo-small.ico
deleted file mode 100644
index 44ed689..0000000
--- a/wrapper-icon/icon/ufo-small.ico
+++ /dev/null
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;

-}