From 9bc5e399ccaaa71b96750c03a98d0ce0aa401309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20R=2E=20Pietraszczyk?= Date: Sun, 13 Oct 2024 13:20:17 +0200 Subject: Fixes for mingw --- MINGW32/Icon.rc | 1 + MINGW32/Makefile.mingw32 | 36 ++++++++++++++++++ MINGW32/icon/Jttt.ico | Bin 0 -> 2686 bytes MINGW32/icon/Trefle.ico | Bin 0 -> 47826 bytes MINGW32/icon/colorsmemory.ico | Bin 0 -> 2686 bytes MINGW32/icon/ufo-small.ico | Bin 0 -> 2190 bytes MINGW32/wrapper.c | 84 ++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 121 insertions(+) create mode 100755 MINGW32/Icon.rc create mode 100755 MINGW32/Makefile.mingw32 create mode 100644 MINGW32/icon/Jttt.ico create mode 100644 MINGW32/icon/Trefle.ico create mode 100644 MINGW32/icon/colorsmemory.ico create mode 100644 MINGW32/icon/ufo-small.ico create mode 100755 MINGW32/wrapper.c (limited to 'MINGW32') diff --git a/MINGW32/Icon.rc b/MINGW32/Icon.rc new file mode 100755 index 0000000..7e45ea3 --- /dev/null +++ b/MINGW32/Icon.rc @@ -0,0 +1 @@ +id ICON "icon/colorsmemory.ico" diff --git a/MINGW32/Makefile.mingw32 b/MINGW32/Makefile.mingw32 new file mode 100755 index 0000000..3349abc --- /dev/null +++ b/MINGW32/Makefile.mingw32 @@ -0,0 +1,36 @@ +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/MINGW32/icon/Jttt.ico b/MINGW32/icon/Jttt.ico new file mode 100644 index 0000000..c5e9ee6 Binary files /dev/null and b/MINGW32/icon/Jttt.ico differ diff --git a/MINGW32/icon/Trefle.ico b/MINGW32/icon/Trefle.ico new file mode 100644 index 0000000..c753797 Binary files /dev/null and b/MINGW32/icon/Trefle.ico differ diff --git a/MINGW32/icon/colorsmemory.ico b/MINGW32/icon/colorsmemory.ico new file mode 100644 index 0000000..eb2475a Binary files /dev/null and b/MINGW32/icon/colorsmemory.ico differ diff --git a/MINGW32/icon/ufo-small.ico b/MINGW32/icon/ufo-small.ico new file mode 100644 index 0000000..44ed689 Binary files /dev/null and b/MINGW32/icon/ufo-small.ico differ 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 +#include +#include +#include // exit +#include // 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 ); +} -- cgit v1.2.3