diff --git a/Jenkinsfile b/Jenkinsfile index 5588f1be..58736fdb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,7 +22,7 @@ pipeline { label "built-in" } steps { - sh("./configure --enable-opengl --enable-vulkan --without-vulkan-string-helper") + sh("./Makefile.pl --enable-opengl --enable-vulkan --without-vulkan-string-helper") sh("make clean") sh("make -j4") } @@ -32,7 +32,7 @@ pipeline { label "built-in" } steps { - sh("./configure --enable-opengl --enable-stb-truetype --disable-freetype2 --cross --target=Windows --host=i686-w64-mingw32") + sh("./Makefile.pl --enable-opengl --enable-stb-truetype --disable-freetype2 --cross --target=Windows --host=i686-w64-mingw32") sh("make clean") sh("make -j4") } @@ -42,7 +42,7 @@ pipeline { label "built-in" } steps { - sh("./configure --enable-opengl --enable-stb-truetype --disable-freetype2 --cross --target=Windows --host=x86_64-w64-mingw32") + sh("./Makefile.pl --enable-opengl --enable-stb-truetype --disable-freetype2 --cross --target=Windows --host=x86_64-w64-mingw32") sh("make clean") sh("make -j4") } diff --git a/configure b/Makefile.pl similarity index 98% rename from configure rename to Makefile.pl index 5ffbe544..519781ec 100755 --- a/configure +++ b/Makefile.pl @@ -187,7 +187,7 @@ print(OUT " clang-format --verbose -i `find src include examples -name \"*.c\" -or -name \"*.h\" -or -name \"*.m\"`\n" ); print(OUT -" perltidy -b -bext=\"/\" --paren-tightness=2 `find tools pl configure -name \"*.pl\"`\n" +" perltidy -b -bext=\"/\" --paren-tightness=2 `find tools pl Makefile.pl -name \"*.pl\"`\n" ); print(OUT "\n"); print(OUT "lib:"); diff --git a/README.txt b/README.txt index f69b6365..744e7a8e 100644 --- a/README.txt +++ b/README.txt @@ -1,23 +1,25 @@ -Greetings - Welcome to the Milsko GUI Toolkit (Version pre-1.0) +Greetings - Welcome to the Milsko GUI Toolkit (Version pre-1.0) - This document contains a brief summary of the contents of this source -distributions and building instructions for Milsko GUI Toolkit. + This document contains a brief summary of the contents of this source +distributions and building instructions for Milsko GUI Toolkit. Requirements - Milsko requires the Windows environment with GDI (so anything NT or 9x) or -the Unix-like environment with X11 for runtime. + Milsko requires either + * A Windows environment with GDI (so anything NT or 9x) + * A Mac OS environment with Cocoa (10.4 is the minimum tested) + * Unix-like environment with X11 for runtime. - To build Milsko for Windows, you must have one of following compilers: - * Visual C++ 6.0 or newer - * Borland C++ 5.5 or newer - * Open Watcom 2.0 or newer - * MinGW-w64 + To build Milsko for Windows, you must have one of following compilers: + * Visual C++ 6.0 or newer + * Borland C++ 5.5 or newer + * Open Watcom 2.0 or newer + * MinGW-w64 - and for Unix-like: - * GNU C Compiler - * Clang + and for Unix-like/Mac OS: + * GNU C Compiler + * Clang Contents @@ -39,31 +41,31 @@ the Unix-like environment with X11 for runtime. Building Milsko - Building Milsko depends on the platform you use, and the compiler you use. + Building Milsko depends on the platform you use, and the compiler you use. A. Visual C++ ------------- -1) Run `nmake -f NTMakefile'. +1) Run `nmake -f NTMakefile'. B. Borland C++ -------------- -1) Run `make -f BorMakefile'. +1) Run `make -f BorMakefile'. C. Open Watcom -------------- -1) Run `wmake -f WatMakefile'. +1) Run `wmake -f WatMakefile'. D. MinGW-w64/GCC/Clang ---------------------- -1) Determine if you need Vulkan and/or OpenGL. +1) Determine if you need Vulkan and/or OpenGL. -2) Run `./configure'. - For help, run `./configure --help'. +2) Run `./Makefile.pl'. + For help, run `./Makefile.pl --help'. -3) Run `make'. +3) Run `make'. - -- Nishi (nishi@nishi.boats) + -- Nishi (nishi@nishi.boats) diff --git a/tools/readme.pl b/tools/readme.pl index c511f794..573d9573 100755 --- a/tools/readme.pl +++ b/tools/readme.pl @@ -105,8 +105,8 @@ l("1) Run `wmake -f WatMakefile'."); h("D. MinGW-w64/GCC/Clang"); l("1) Determine if you need Vulkan and/or OpenGL."); l(""); -l("2) Run `./configure'."); -l(" For help, run `./configure --help'."); +l("2) Run `./Makefile.pl'."); +l(" For help, run `./Makefile.pl --help'."); l(""); l("3) Run `make'."); l("");