forked from pyrite-dev/milsko
perltidy
This commit is contained in:
parent
22b0891598
commit
6341b76a86
6 changed files with 18 additions and 17 deletions
|
|
@ -1,8 +1,7 @@
|
||||||
my @enabled_backends = ();
|
my @enabled_backends = ();
|
||||||
|
|
||||||
add_incdir2("-I/usr/local/include");
|
add_incdir2("-I/usr/local/include");
|
||||||
add_libdir(
|
add_libdir("-L/usr/local/lib -Wl,-R/usr/local/lib");
|
||||||
"-L/usr/local/lib -Wl,-R/usr/local/lib");
|
|
||||||
|
|
||||||
if (param_get("wayland") && not(param_get("tiny"))) {
|
if (param_get("wayland") && not(param_get("tiny"))) {
|
||||||
push(@enabled_backends, "wayland");
|
push(@enabled_backends, "wayland");
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
add_incdir2("-I/usr/local/include");
|
add_incdir2("-I/usr/local/include");
|
||||||
add_libdir(
|
add_libdir("-L/usr/local/lib -Wl,-R/usr/local/lib");
|
||||||
"-L/usr/local/lib -Wl,-R/usr/local/lib");
|
|
||||||
use_backend("x11");
|
use_backend("x11");
|
||||||
add_libs("-lpthread");
|
add_libs("-lpthread");
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ if (param_get("tiny")) {
|
||||||
|
|
||||||
# these don't actually disable either, they're here for the final output.
|
# these don't actually disable either, they're here for the final output.
|
||||||
param_set("wayland", 0);
|
param_set("wayland", 0);
|
||||||
param_set("dbus", 0);
|
param_set("dbus", 0);
|
||||||
}
|
}
|
||||||
if (param_get("classic-theme")) {
|
if (param_get("classic-theme")) {
|
||||||
add_cflags("-DUSE_CLASSIC_THEME");
|
add_cflags("-DUSE_CLASSIC_THEME");
|
||||||
|
|
@ -96,7 +96,7 @@ if (grep(/^cocoa$/, @backends) || param_get("gnustep")) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (grep(/^haiku$/, @backends)) {
|
if (grep(/^haiku$/, @backends)) {
|
||||||
new_object("src/backend/haiku.cxx");
|
new_object("src/backend/haiku.cxx");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (param_get("stb-image")) {
|
if (param_get("stb-image")) {
|
||||||
|
|
@ -118,7 +118,6 @@ if (param_get("allow-sloppy-focus")) {
|
||||||
add_cflags("-DALLOW_SLOPPY_FOCUS");
|
add_cflags("-DALLOW_SLOPPY_FOCUS");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
add_incdir("-Iexternal/libz/include");
|
add_incdir("-Iexternal/libz/include");
|
||||||
|
|
||||||
if (param_get("freetype2")) {
|
if (param_get("freetype2")) {
|
||||||
|
|
|
||||||
|
|
@ -876,9 +876,9 @@ static int MwLLGDICallInitImpl(void) {
|
||||||
|
|
||||||
if(wsymtbl.lib_dwmapi != NULL) DwmSetWindowAttribute = MwDynamicSymbol(wsymtbl.lib_dwmapi, "DwmSetWindowAttribute");
|
if(wsymtbl.lib_dwmapi != NULL) DwmSetWindowAttribute = MwDynamicSymbol(wsymtbl.lib_dwmapi, "DwmSetWindowAttribute");
|
||||||
|
|
||||||
if((ntdll = GetModuleHandle("ntdll.dll")) != NULL && GetProcAddress(ntdll, "wine_get_version") != NULL){
|
if((ntdll = GetModuleHandle("ntdll.dll")) != NULL && GetProcAddress(ntdll, "wine_get_version") != NULL) {
|
||||||
is_plgblt_reliable = 0;
|
is_plgblt_reliable = 0;
|
||||||
}else{
|
} else {
|
||||||
is_plgblt_reliable = 1;
|
is_plgblt_reliable = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -129,16 +129,17 @@ static int wcreate(MwWidget handle) {
|
||||||
SetPixelFormat(o->dc, pf, &pfd);
|
SetPixelFormat(o->dc, pf, &pfd);
|
||||||
|
|
||||||
o->lib = MwDynamicOpen("opengl32.dll");
|
o->lib = MwDynamicOpen("opengl32.dll");
|
||||||
if(!o->lib){
|
if(!o->lib) {
|
||||||
printf("Could not load OpenGL widget under WGL!\n"); \
|
printf("Could not load OpenGL widget under WGL!\n");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define WGL_FUNC(x) o->x = MwDynamicSymbol(o->lib, #x); \
|
#define WGL_FUNC(x) \
|
||||||
if(o->x == NULL){ \
|
o->x = MwDynamicSymbol(o->lib, #x); \
|
||||||
printf("Could not load OpenGL widget under WGL! " #x " missing.\n"); \
|
if(o->x == NULL) { \
|
||||||
return 1; \
|
printf("Could not load OpenGL widget under WGL! " #x " missing.\n"); \
|
||||||
}
|
return 1; \
|
||||||
|
}
|
||||||
|
|
||||||
WGL_FUNC(wglCreateContext);
|
WGL_FUNC(wglCreateContext);
|
||||||
WGL_FUNC(wglMakeCurrent);
|
WGL_FUNC(wglMakeCurrent);
|
||||||
|
|
|
||||||
|
|
@ -60,6 +60,7 @@ c("Requirements");
|
||||||
l("");
|
l("");
|
||||||
l(" Milsko requires either");
|
l(" Milsko requires either");
|
||||||
l(" * A Windows environment with GDI (so anything NT or 9x)");
|
l(" * A Windows environment with GDI (so anything NT or 9x)");
|
||||||
|
|
||||||
#l(" * A MacOS environment with Cocoa (10.4 or above supported)");
|
#l(" * A MacOS environment with Cocoa (10.4 or above supported)");
|
||||||
l(" * A Unix-like environment with Wayland and/or X11 for runtime.");
|
l(" * A Unix-like environment with Wayland and/or X11 for runtime.");
|
||||||
l("");
|
l("");
|
||||||
|
|
@ -108,7 +109,9 @@ l("1) Determine if you need Vulkan and/or OpenGL.");
|
||||||
l("");
|
l("");
|
||||||
l("2) Either:");
|
l("2) Either:");
|
||||||
l(" a.) Run `./configure'. For help, run `./configure --help'.");
|
l(" a.) Run `./configure'. For help, run `./configure --help'.");
|
||||||
l(" b.) Use CMake; i.e. `cmake -B build`. (if contributing, name the build folder build as that's what's included in the .gitignore)");
|
l(
|
||||||
|
" b.) Use CMake; i.e. `cmake -B build`. (if contributing, name the build folder build as that's what's included in the .gitignore)"
|
||||||
|
);
|
||||||
l("");
|
l("");
|
||||||
l("3) Run `make'.");
|
l("3) Run `make'.");
|
||||||
l("");
|
l("");
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue