diff --git a/Makefile b/Makefile index c983ccc..7de4a18 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,16 @@ +ifeq ($(ARCH),win) +GCC := i486-mingw32-gcc +FLAGS := +OUTPUT := sudokuloeser.exe +else +GCC := gcc +FLAGS := -lrt +OUTPUT := sudokuloeser +endif + + sudokuloeser: input.o input_nstd.o main.o output.o output_nstd.o output_std.o solver.o solver_nstd.o solver_std.o html.o - gcc -lrt -o sudokuloeser input.o input_nstd.o main.o output.o output_nstd.o output_std.o solver.o solver_nstd.o solver_std.o html.o + ${GCC} ${FLAGS} -o ${OUTPUT} input.o input_nstd.o main.o output.o output_nstd.o output_std.o solver.o solver_nstd.o solver_std.o html.o install: sudokuloeser install -vDm755 sudokuloeser /usr/bin/sudokuloeser @@ -8,25 +19,25 @@ uninstall: rm /usr/bin/sudokuloeser input.o: input.c input.h types.h - gcc -Wall -pedantic -c input.c + ${GCC} -Wall -pedantic -c input.c input_nstd.o: input_nstd.c input_nstd.h types.h - gcc -Wall -pedantic -c input_nstd.c + ${GCC} -Wall -pedantic -c input_nstd.c main.o: main.c main.h types.h input.h input_nstd.h solver.h solver_std.h solver_nstd.h output.h output_std.h output_nstd.h html.h - gcc -Wall -pedantic -c main.c + ${GCC} -Wall -pedantic -c main.c output.o: output.c output.h types.h - gcc -Wall -pedantic -c output.c + ${GCC} -Wall -pedantic -c output.c output_nstd.o: output_nstd.c output_nstd.h types.h - gcc -Wall -pedantic -c output_nstd.c + ${GCC} -Wall -pedantic -c output_nstd.c output_std.o: output_std.c output_std.h types.h - gcc -Wall -pedantic -c output_std.c + ${GCC} -Wall -pedantic -c output_std.c solver.o: solver.c solver.h types.h - gcc -Wall -pedantic -c solver.c + ${GCC} -Wall -pedantic -c solver.c solver_nstd.o: solver_nstd.c solver_nstd.h types.h - gcc -Wall -pedantic -c solver_nstd.c + ${GCC} -Wall -pedantic -c solver_nstd.c solver_std.o: solver_std.c solver_std.h types.h - gcc -Wall -pedantic -c solver_std.c + ${GCC} -Wall -pedantic -c solver_std.c html.o: html.c html.h types.h - gcc -Wall -pedantic -c html.c + ${GCC} -Wall -pedantic -c html.c clean: rm -vf *.o diff --git a/README.md b/README.md index e790d06..477e185 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,10 @@ -# About +# sudokuloeser + +## About sudokuloeser is a simple sudoku solver written in C. It is optimized for speed. -# Features +## Features With sudokuloeser you can easily solve sudokus. @@ -10,18 +12,19 @@ Optional you can specify a file, where to save the solution. For better usage the Output is colored. -# Requirements +## Requirements * Linux -* Windows: some restrictions +* Windows: some restrictions + `make ARCH=win` * C Compiler -# Installation +## Installation make make install -# Usage +## Usage Usage: ./sudokuloeser [options] diff --git a/main.c b/main.c index 92c440a..2f54190 100644 --- a/main.c +++ b/main.c @@ -253,9 +253,9 @@ void print_help(int argc, char **argv) { printf(" white: Values find by backtracking\n\n"); printf("By Thomas Battermann\n"); #else -printf("\033[0;1mUsage:\033[0m\n"); +printf("Usage:\n"); printf(" %s [options] \n",argv[0]); - printf("\033[0;1mOptions\033[0m\n"); + printf("Options\n"); printf(" -U Unicode borders\n"); printf(" -h This help\n"); printf(" -H HTML-Output\n"); @@ -264,11 +264,7 @@ printf("\033[0;1mUsage:\033[0m\n"); printf(" -O Overlay for non-standard files\n"); printf(" -p Plaintext\n"); printf(" -n Dont solve, just print\n"); - printf(" -s silent\n"); - printf("\033[0;1mOutput:\033[0m\n"); - printf(" \033[32;1mgreen:\033[0m Given values\n"); - printf(" \033[33;1myellow:\033[0m Values find by logic\n"); - printf(" white: Values find by backtracking\n\n"); + printf(" -s silent\n\n"); printf("By Thomas Battermann\n"); #endif }