Fix dynamic configuration

Timu5 · Jun 21, 2019 · 5b0a324 · 5b0a324
1 parent 6385998
commit 5b0a324
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/demo/dub.sdl b/demo/dub.sdl
@@ -4,7 +4,7 @@ authors "Mateusz Muszynski"
 license "BSL-1.0"
 dependency "bindbc-nuklear" path="./.."
 dependency "bindbc-opengl" version="~>0.9.0"
-dependency "bindbc-sdl" version="~>0.9.1"
+dependency "bindbc-sdl" version="~>0.10.1"
 
 configuration "dynamic" {
     targetType "executable"

diff --git a/demo/source/main.d b/demo/source/main.d
@@ -433,7 +433,8 @@ int main(string[] args)
     int win_width= 1200;
     int win_height = 800;
 
-    version(BindNuklear_Dynamic)
+    version(BindNuklear_Static) {}
+    else
     {
         NuklearSupport nuksup = loadNuklear();
         if(nuksup != NuklearSupport.Nuklear4)
@@ -443,7 +444,8 @@ int main(string[] args)
         }
     }
 
-    version(BindSDL_Dynamic)
+    version(BindSDL_Static) {}
+    else
     {
         SDLSupport sdlsup = loadSDL();
         if (sdlsup != sdlSupport)

diff --git a/dub.sdl b/dub.sdl
@@ -24,12 +24,12 @@ configuration "dynamicBC" {
 configuration "static" {
     versions "BindNuklear_Static"
     excludedSourceFiles "source/bindbc/nuklear/binddynamic.d"
-    lflags "-L$PACKAGE_DIR/lib" "-lnuklear_static" "-lSDL2"
+    lflags "-L$PACKAGE_DIR/lib" "-lnuklear_static" "-lSDL2" platform="posix"
 }
 
 configuration "staticBC" {
     dflags "-betterC"
     versions "BindNuklear_Static"
     excludedSourceFiles "source/bindbc/nuklear/binddynamic.d"
-    lflags "-L$PACKAGE_DIR/lib" "-lnuklear_static" "-lSDL2"
+    lflags "-L$PACKAGE_DIR/lib" "-lnuklear_static" "-lSDL2" platform="posix"
 }
diff --git a/source/bindbc/nuklear/binddynamic.d b/source/bindbc/nuklear/binddynamic.d
@@ -1661,13 +1661,13 @@ NuklearSupport loadNuklear(const(char)* libName)
     lib.bindSymbol(cast(void**)&nk_str_get_const,"nk_str_get_const");
     lib.bindSymbol(cast(void**)&nk_str_len,"nk_str_len");
     lib.bindSymbol(cast(void**)&nk_str_len_char,"nk_str_len_char");
-    lib.bindSymbol(cast(void**)&nk_filter_default,"nk_filter_default");
-    lib.bindSymbol(cast(void**)&nk_filter_ascii,"nk_filter_ascii");
-    lib.bindSymbol(cast(void**)&nk_filter_float,"nk_filter_float");
-    lib.bindSymbol(cast(void**)&nk_filter_decimal,"nk_filter_decimal");
-    lib.bindSymbol(cast(void**)&nk_filter_hex,"nk_filter_hex");
-    lib.bindSymbol(cast(void**)&nk_filter_oct,"nk_filter_oct");
-    lib.bindSymbol(cast(void**)&nk_filter_binary,"nk_filter_binary");
+    lib.bindSymbol(cast(void**)&nk_filter_default_fptr,"nk_filter_default");
+    lib.bindSymbol(cast(void**)&nk_filter_ascii_fptr,"nk_filter_ascii");
+    lib.bindSymbol(cast(void**)&nk_filter_float_fptr,"nk_filter_float");
+    lib.bindSymbol(cast(void**)&nk_filter_decimal_fptr,"nk_filter_decimal");
+    lib.bindSymbol(cast(void**)&nk_filter_hex_fptr,"nk_filter_hex");
+    lib.bindSymbol(cast(void**)&nk_filter_oct_fptr,"nk_filter_oct");
+    lib.bindSymbol(cast(void**)&nk_filter_binary_fptr,"nk_filter_binary");
     version(NK_INCLUDE_DEFAULT_ALLOCATOR) {
         lib.bindSymbol(cast(void**)&nk_textedit_init_default,"nk_textedit_init_default");
     }