fix

git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@643 b9cfdab3-6d41-4d17-bbe4-086880011989

Makefile.pl

@@ -119,13 +119,16 @@ print("Target : " . $target . "\n");
 
 my @l = ();
 foreach my $e (param_list()) {
+    if (not(param_get($e))) {
+        next;
+    }
     if (($e eq "vulkan-string-helper") and param_get("vulkan")) {
         push(@l, $e);
     }
     elsif (($e eq "xrender") and ($backend eq "x11")) {
         push(@l, $e);
     }
-    elsif (not($e eq "vulkan-string-helper") and not($e eq "xrender") and param_get($e)) {
+    elsif (not($e eq "vulkan-string-helper") and not($e eq "xrender")) {
         push(@l, $e);
     }
 }

pl/ostype/NetBSD.pl

@@ -1,6 +1,7 @@
 # $Id$
 add_incdir("-I/usr/X11R7/include -I/usr/pkg/include");
-add_libdir("-L/usr/X11R7/lib -Wl,-R/usr/X11R7/lib -L/usr/pkg/lib -Wl,-R/usr/pkg/lib");
+add_libdir(
+    "-L/usr/X11R7/lib -Wl,-R/usr/X11R7/lib -L/usr/pkg/lib -Wl,-R/usr/pkg/lib");
 use_backend("x11");
 
 1;

pl/rules.pl

@@ -3,38 +3,40 @@ new_object("src/*.c");
 
 my $gl_libs = "";
 
-if($backend eq "x11"){
+if ($backend eq "x11") {
     add_cflags("-DUSE_X11");
     new_object("src/backend/x11.c");
     add_libs("-lX11 -lXrender -lXcursor");
 
     $gl_libs = "-lGL -lGLU";
-}elsif($backend eq "gdi"){
+}
+elsif ($backend eq "gdi") {
     add_cflags("-DUSE_GDI");
     new_object("src/backend/gdi.c");
     add_libs("-lgdi32");
 
     $gl_libs = "-lopengl32 -lglu32";
-}elsif($backend eq "darwin"){
+}
+elsif ($backend eq "darwin") {
     add_cflags("-DUSE_DARWIN");
     new_object("src/backend/mac/*.c");
     add_ldflags("-framework Carbon");
 }
 
-if(param_get("stb-image")){
+if (param_get("stb-image")) {
     add_cflags("-DUSE_STB_IMAGE");
 }
-if(param_get("stb-truetype")){
+if (param_get("stb-truetype")) {
     add_cflags("-DUSE_STB_TRUETYPE");
 }
-if(param_get("freetype2")){
+if (param_get("freetype2")) {
     add_cflags("-DUSE_FREETYPE2");
-	if(not($cross)){
+    if (not($cross)) {
         add_cflags(`pkg-config --cflags freetype2`);
         add_libs(`pkg-config --libs freetype2`);
     }
 }
-if(param_get("xrender")){
+if (param_get("xrender")) {
     add_cflags("-DUSE_XRENDER");
 }
 
@@ -57,10 +59,11 @@ new_object("src/widget/scrollbar.c");
 new_object("src/widget/submenu.c");
 new_object("src/widget/viewport.c");
 new_object("src/widget/window.c");
-if(param_get("opengl")){
+
+if (param_get("opengl")) {
     new_object("src/widget/opengl.c");
 }
-if(param_get("vulkan")){
+if (param_get("vulkan")) {
     new_object("src/widget/vulkan.c");
 }
 
@@ -70,7 +73,6 @@ new_object("src/abstract/*.c");
 
 new_object("external/*.c");
 
-
 new_example("examples/basic/example");
 new_example("examples/basic/rotate");
 new_example("examples/basic/image");
@@ -83,7 +85,7 @@ new_example("examples/basic/listbox");
 new_example("examples/basic/progressbar");
 new_example("examples/basic/colorpicker");
 
-if(param_get("opengl")){
+if (param_get("opengl")) {
     new_example("examples/gldemos/boing",    $gl_libs);
     new_example("examples/gldemos/clock",    $gl_libs);
     new_example("examples/gldemos/cube",     $gl_libs);
@@ -92,7 +94,7 @@ if(param_get("opengl")){
     new_example("examples/gldemos/tripaint", $gl_libs);
 }
 
-if(param_get("vulkan")){
+if (param_get("vulkan")) {
     new_example("examples/vkdemos/vulkan");
 }
 

pl/utils.pl

@@ -35,7 +35,7 @@ sub add_libs {
 }
 
 sub new_example {
-	if(@_ == 2){
+    if (@_ == 2) {
         $examples_libs{"$_[0]${executable_suffix}"} = $_[1];
     }
     push(@examples_targets, "${_[0]}${executable_suffix}");
@@ -43,7 +43,7 @@ sub new_example {
 
 sub new_object {
     my @l = glob($_[0]);
-	foreach my $e (@l){
+    foreach my $e (@l) {
         $e =~ s/\.c$/$object_suffix/;
         push(@library_targets, $e);
     }
@@ -54,15 +54,17 @@ sub use_backend {
 }
 
 our %params = ();
+
 sub param_set {
-	$params{$_[0]} = $_[1];
+    $params{ $_[0] } = $_[1];
 }
 
 sub param_get {
-	if(not(defined($params{$_[0]}))){
+    if (not(defined($params{ $_[0] }))) {
         return 0;
-	}else{
-		return $params{$_[0]};
+    }
+    else {
+        return $params{ $_[0] };
     }
 }