emsc: wip

Author: igagis

.vscode/tasks.json

@@ -57,16 +57,16 @@
             "group": "build"
         },
         {
-            "label": "run-app-dbg-ogles2",
+            "label": "run-app-dbg-ogles",
             "type": "shell",
-            "command": "make run-app config=dbg ogles2=true",
+            "command": "make run-app config=dbg ogles=true",
             "problemMatcher": [],
             "group": "build"
         },
         {
-            "label": "run-app-dbg-ogles2-wayland",
+            "label": "run-app-dbg-ogles-wayland",
             "type": "shell",
-            "command": "WAYLAND_DISPLAY=$(ls /run/user/$UID/ | grep wayland-[0-9]$) make run-app config=dbg ogles2=true wayland=true",
+            "command": "WAYLAND_DISPLAY=$(ls /run/user/$UID/ | grep wayland-[0-9]$) make run-app config=dbg ogles=true wayland=true",
             "problemMatcher": [],
             "group": "build"
         },

build/emscripten/conanfile.txt

@@ -0,0 +1,11 @@
+[requires]
+ruis/[>=0.5.270]@cppfw/main
+papki/[>=0.0.0]@cppfw/main
+ruis-render-opengles/[>=0.1.70]@cppfw/main
+
+[tool_requires]
+prorab/[>=2.0.27]@cppfw/main
+prorab-extra/[>=0.2.57]@cppfw/main
+
+[generators]
+AutotoolsDeps

config/emsc.mk

@@ -6,7 +6,7 @@ this_cxx := em++
 this_cc := emcc
 this_ar := emar
 
-this_static_lib_only = : true
+this_static_lib_only := true
 
 # TODO: remove the warning suppression when the PR is merged
 # Suppress version-check warning due to https://github.com/conan-io/conan-center-index/pull/26247
@@ -19,3 +19,4 @@ this_cxxflags += -pthread
 this_ldflags += -pthread
 
 this_cxxflags += --use-port=sdl2
+this_ldflags += --use-port=sdl2

tests/app/makefile

@@ -18,16 +18,22 @@ ifeq ($(os),linux)
         this__backend := xorg
     endif
 
-    this__cfg_suffix := $(if $(ogles2),opengles,opengl)-$(this__backend)
-    this_libruisapp := libruisapp-$(this__cfg_suffix)
+    this__cfg_suffix := $(if $(ogles),opengles,opengl)-$(this__backend)
+    this__libruisapp := libruisapp-$(this__cfg_suffix)
 else
-    this__cfg_suffix := $(if $(ogles2),opengles,opengl)
-    this_libruisapp := libruisapp-opengl
+    this__cfg_suffix := $(if $(ogles),opengles,opengl)
+    this__libruisapp := libruisapp-opengl
 endif
 
-this_libruisapp := ../../src/out/$(c)/$(this__cfg_suffix)/$(this_libruisapp)$(dot_so)
+this__libruisapp := ../../src/out/$(c)/$(this__cfg_suffix)/$(this__libruisapp)
 
-this_ldlibs += $(this_libruisapp)
+ifeq ($(config), emsc)
+    this__libruisapp := $(this__libruisapp).a
+else
+    this__libruisapp := $(this__libruisapp)$(dot_so)
+endif
+
+this_ldlibs += $(this__libruisapp)
 
 ifeq ($(os),windows)
     this_ldlibs += -lmingw32 # these should go first, otherwise linker will complain about undefined reference to WinMain
@@ -51,3 +57,12 @@ this_test_ld_path := ../../src/out/$(c)/$(this__cfg_suffix)/
 $(eval $(prorab-run))
 
 $(eval $(call prorab-include, ../../src/makefile))
+
+# targets for building with conan and emscripten
+
+define this__rules
+conan_install:
+$(.RECIPEPREFIX)@echo install conan dependencies
+$(.RECIPEPREFIX)$(a)conan install $(d)../../build/emscripten --update --profile:host $(d)../../build/emscripten/conan.profile --build=missing --output-folder=$(d)out/emsc
+endef
+$(eval $(this__rules))