Compare commits

..

No commits in common. "d69dd83f18d801b524339b345662105893f5f3f3" and "fea0fc9c32af767a1801e73740f2d99161ae07cc" have entirely different histories.

4 changed files with 30 additions and 28 deletions

6
Jenkinsfile vendored
View file

@ -22,7 +22,7 @@ pipeline {
label "built-in" label "built-in"
} }
steps { 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 clean")
sh("make -j4") sh("make -j4")
} }
@ -32,7 +32,7 @@ pipeline {
label "built-in" label "built-in"
} }
steps { 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 clean")
sh("make -j4") sh("make -j4")
} }
@ -42,7 +42,7 @@ pipeline {
label "built-in" label "built-in"
} }
steps { 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 clean")
sh("make -j4") sh("make -j4")
} }

View file

@ -187,7 +187,7 @@ print(OUT
" clang-format --verbose -i `find src include examples -name \"*.c\" -or -name \"*.h\" -or -name \"*.m\"`\n" " clang-format --verbose -i `find src include examples -name \"*.c\" -or -name \"*.h\" -or -name \"*.m\"`\n"
); );
print(OUT 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 "\n");
print(OUT "lib:"); print(OUT "lib:");

View file

@ -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 This document contains a brief summary of the contents of this source
distributions and building instructions for Milsko GUI Toolkit. distributions and building instructions for Milsko GUI Toolkit.
Requirements Requirements
Milsko requires the Windows environment with GDI (so anything NT or 9x) or Milsko requires either
the Unix-like environment with X11 for runtime. * 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: To build Milsko for Windows, you must have one of following compilers:
* Visual C++ 6.0 or newer * Visual C++ 6.0 or newer
* Borland C++ 5.5 or newer * Borland C++ 5.5 or newer
* Open Watcom 2.0 or newer * Open Watcom 2.0 or newer
* MinGW-w64 * MinGW-w64
and for Unix-like: and for Unix-like/Mac OS:
* GNU C Compiler * GNU C Compiler
* Clang * Clang
Contents Contents
@ -39,31 +41,31 @@ the Unix-like environment with X11 for runtime.
Building Milsko 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++ A. Visual C++
------------- -------------
1) Run `nmake -f NTMakefile'. 1) Run `nmake -f NTMakefile'.
B. Borland C++ B. Borland C++
-------------- --------------
1) Run `make -f BorMakefile'. 1) Run `make -f BorMakefile'.
C. Open Watcom C. Open Watcom
-------------- --------------
1) Run `wmake -f WatMakefile'. 1) Run `wmake -f WatMakefile'.
D. MinGW-w64/GCC/Clang 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'. 2) Run `./Makefile.pl'.
For help, run `./configure --help'. For help, run `./Makefile.pl --help'.
3) Run `make'. 3) Run `make'.
-- Nishi (nishi@nishi.boats) -- Nishi (nishi@nishi.boats)

View file

@ -105,8 +105,8 @@ l("1) Run `wmake -f WatMakefile'.");
h("D. MinGW-w64/GCC/Clang"); h("D. MinGW-w64/GCC/Clang");
l("1) Determine if you need Vulkan and/or OpenGL."); l("1) Determine if you need Vulkan and/or OpenGL.");
l(""); l("");
l("2) Run `./configure'."); l("2) Run `./Makefile.pl'.");
l(" For help, run `./configure --help'."); l(" For help, run `./Makefile.pl --help'.");
l(""); l("");
l("3) Run `make'."); l("3) Run `make'.");
l(""); l("");