make build work

downplay · Mar 4, 2025 · 57c45af · 57c45af
1 parent b4b2d12
commit 57c45af
Show file tree

Hide file tree

Showing 47 changed files with 1,053 additions and 5 deletions.
diff --git a/crawl-ref/source/.gitignore b/crawl-ref/source/.gitignore
@@ -5,3 +5,5 @@ coverage-html-report/
 default.profraw
 coverage.profdata
 coverage.info
+crawl.*
+*.o.tmp
diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile
@@ -157,7 +157,7 @@ CFWARN_L += -Wextra \
 DEFINES := $(EXTERNAL_DEFINES)
 
 ifndef ANDROID
-LDFLAGS := -sLEGACY_GL_EMULATION -sMAX_WEBGL_VERSION=2
+LDFLAGS := -sLEGACY_GL_EMULATION -sALLOW_MEMORY_GROWTH=1 -sMAXIMUM_MEMORY=1gb -lworkerfs.js
 endif
 
 #
@@ -526,7 +526,8 @@ HOSTCC := $(FORCE_CC)
 export HOSTCC
 else
 # GCC := emcc -pthread -sSHARED_MEMORY -sWASM_WORKERS=1 -sUSE_ZLIB=1 -sUSE_FREETYPE=1 -sUSE_SDL_IMAGE=2
-GCC := emcc -pthread -sSHARED_MEMORY -sWASM_WORKERS=1 -sUSE_ZLIB=1 -sUSE_SDL=2 -sUSE_SDL_IMAGE=2 -sUSE_FREETYPE=1
+# GCC := emcc -pthread -sSHARED_MEMORY=1 -sWASM_WORKERS=1 -sUSE_ZLIB=1 -sUSE_SDL=2 -sUSE_SDL_IMAGE=2 -sUSE_FREETYPE=1
+GCC := emcc -O3 -pthread -sSHARED_MEMORY=1 -sUSE_ZLIB=1 -sUSE_SDL=2 -sUSE_SDL_IMAGE=2 -sUSE_FREETYPE=1
 # GCC := $(LMACH)$(GCC_VER_PREFIX)emcc$(GCC_VER_SUFFIX)
 endif
 
@@ -536,7 +537,8 @@ HOSTCXX := $(FORCE_CXX)
 export HOSTCXX
 else
 # GXX := em++ -pthread -sSHARED_MEMORY -sWASM_WORKERS=1 -sUSE_ZLIB=1 -sUSE_FREETYPE=1 -sUSE_SDL_IMAGE=2
-GXX := em++ -pthread -sSHARED_MEMORY -sWASM_WORKERS=1 -sUSE_ZLIB=1 -sUSE_SDL=2 -sUSE_SDL_IMAGE=2 -sUSE_FREETYPE=1
+# GXX := em++ -pthread -sSHARED_MEMORY=1 -sWASM_WORKERS=1 -sUSE_ZLIB=1 -sUSE_SDL=2 -sUSE_SDL_IMAGE=2 -sUSE_FREETYPE=1
+GXX := em++ -O3 -pthread -sSHARED_MEMORY=1 -sUSE_ZLIB=1 -sUSE_SDL=2 -sUSE_SDL_IMAGE=2 -sUSE_FREETYPE=1
 # GXX := $(LMACH)$(GCC_VER_PREFIX)em++$(GCC_VER_SUFFIX)
 endif
 
@@ -779,7 +781,7 @@ ifndef WIN32
 LIBS += -lSDL2_mixer
 endif
 endif
-LIBS += -lSDL2_image $(SDL2_LDFLAGS) $(FREETYPE_LDFLAGS)
+# LIBS += -lSDL2_image $(SDL2_LDFLAGS) $(FREETYPE_LDFLAGS)
 
 endif # pkg-config
 
@@ -1680,7 +1682,7 @@ distclean: clean clean-contrib clean-rltiles
 	$(RM) -r $(DOXYGEN_HTML_GEN)
 
 $(GAME): $(GAME_OBJS) $(CONTRIB_LIBS) dat/dlua/tags.lua
-	+$(QUIET_LINK)$(CXX) $(LDFLAGS) $(GAME_OBJS) -o $(GAME).html $(LIBS) --preload-file dat --use-preload-plugins
+	+$(QUIET_LINK)$(CXX) $(LDFLAGS) $(GAME_OBJS) -o $(GAME).html $(LIBS) --preload-file dat/des --preload-file dat/tiles --preload-file dat/clua --preload-file dat/dlua --use-preload-plugins
 
 util/monster/vault_monster_data.h: dat/des util/gather_mons
 	util/gather_mons -v > $@

diff --git a/crawl-ref/source/dat/tiles/title_Cws_Minotauros.png b/crawl-ref/source/dat/tiles/title_Cws_Minotauros.png
diff --git a/crawl-ref/source/dat/tiles/title_SpinningBird_djinn_sears_gnolls.png b/crawl-ref/source/dat/tiles/title_SpinningBird_djinn_sears_gnolls.png
diff --git a/crawl-ref/source/dat/tiles/title_anon_octopus_wizard.png b/crawl-ref/source/dat/tiles/title_anon_octopus_wizard.png
diff --git a/crawl-ref/source/dat/tiles/title_arbituhhh_tesu.png b/crawl-ref/source/dat/tiles/title_arbituhhh_tesu.png
diff --git a/crawl-ref/source/dat/tiles/title_baconkid_duvessa_dowan.png b/crawl-ref/source/dat/tiles/title_baconkid_duvessa_dowan.png
diff --git a/crawl-ref/source/dat/tiles/title_baconkid_gastronok.png b/crawl-ref/source/dat/tiles/title_baconkid_gastronok.png
diff --git a/crawl-ref/source/dat/tiles/title_baconkid_mnoleg.png b/crawl-ref/source/dat/tiles/title_baconkid_mnoleg.png
diff --git a/crawl-ref/source/dat/tiles/title_benadryl_antaeus.png b/crawl-ref/source/dat/tiles/title_benadryl_antaeus.png
diff --git a/crawl-ref/source/dat/tiles/title_benadryl_oni.png b/crawl-ref/source/dat/tiles/title_benadryl_oni.png
diff --git a/crawl-ref/source/dat/tiles/title_denzi_dragon.png b/crawl-ref/source/dat/tiles/title_denzi_dragon.png
diff --git a/crawl-ref/source/dat/tiles/title_denzi_evil_mage.png b/crawl-ref/source/dat/tiles/title_denzi_evil_mage.png
diff --git a/crawl-ref/source/dat/tiles/title_denzi_invasion.png b/crawl-ref/source/dat/tiles/title_denzi_invasion.png
diff --git a/crawl-ref/source/dat/tiles/title_denzi_kitchen_duty.png b/crawl-ref/source/dat/tiles/title_denzi_kitchen_duty.png
diff --git a/crawl-ref/source/dat/tiles/title_denzi_summoner.png b/crawl-ref/source/dat/tiles/title_denzi_summoner.png
diff --git a/crawl-ref/source/dat/tiles/title_denzi_undead_warrior.png b/crawl-ref/source/dat/tiles/title_denzi_undead_warrior.png
diff --git a/crawl-ref/source/dat/tiles/title_e_m_fields.png b/crawl-ref/source/dat/tiles/title_e_m_fields.png
diff --git a/crawl-ref/source/dat/tiles/title_firemage.png b/crawl-ref/source/dat/tiles/title_firemage.png
diff --git a/crawl-ref/source/dat/tiles/title_froggy_goodgod_tengu_gold.png b/crawl-ref/source/dat/tiles/title_froggy_goodgod_tengu_gold.png
diff --git a/crawl-ref/source/dat/tiles/title_froggy_natasha_and_boris.png b/crawl-ref/source/dat/tiles/title_froggy_natasha_and_boris.png
diff --git a/crawl-ref/source/dat/tiles/title_froggy_rune_and_run_failed_on_dis.png b/crawl-ref/source/dat/tiles/title_froggy_rune_and_run_failed_on_dis.png
diff --git a/crawl-ref/source/dat/tiles/title_froggy_thunder_fist_nikola.png b/crawl-ref/source/dat/tiles/title_froggy_thunder_fist_nikola.png
diff --git a/crawl-ref/source/dat/tiles/title_gompami_kohu_xbow.png b/crawl-ref/source/dat/tiles/title_gompami_kohu_xbow.png
diff --git a/crawl-ref/source/dat/tiles/title_kaonedong_ignis_the_dying_flame.png b/crawl-ref/source/dat/tiles/title_kaonedong_ignis_the_dying_flame.png
diff --git a/crawl-ref/source/dat/tiles/title_kaonedong_menkaure_prince_of_dust.png b/crawl-ref/source/dat/tiles/title_kaonedong_menkaure_prince_of_dust.png
diff --git a/crawl-ref/source/dat/tiles/title_king7artist_eustachio.png b/crawl-ref/source/dat/tiles/title_king7artist_eustachio.png
diff --git a/crawl-ref/source/dat/tiles/title_micah_c_ereshkigal.png b/crawl-ref/source/dat/tiles/title_micah_c_ereshkigal.png
diff --git a/crawl-ref/source/dat/tiles/title_nibiki_octopode.png b/crawl-ref/source/dat/tiles/title_nibiki_octopode.png
diff --git a/crawl-ref/source/dat/tiles/title_omndra_zot_demon.png b/crawl-ref/source/dat/tiles/title_omndra_zot_demon.png
diff --git a/crawl-ref/source/dat/tiles/title_peileppe_bloax_eye.png b/crawl-ref/source/dat/tiles/title_peileppe_bloax_eye.png
diff --git a/crawl-ref/source/dat/tiles/title_philosopheropposite_palentonga_paladin.png b/crawl-ref/source/dat/tiles/title_philosopheropposite_palentonga_paladin.png
diff --git a/crawl-ref/source/dat/tiles/title_ploomutoo_ijyb.png b/crawl-ref/source/dat/tiles/title_ploomutoo_ijyb.png
diff --git a/crawl-ref/source/dat/tiles/title_pooryurik_knight.png b/crawl-ref/source/dat/tiles/title_pooryurik_knight.png
diff --git a/crawl-ref/source/dat/tiles/title_psiweapon_kiku.png b/crawl-ref/source/dat/tiles/title_psiweapon_kiku.png
diff --git a/crawl-ref/source/dat/tiles/title_psiweapon_roxanne.png b/crawl-ref/source/dat/tiles/title_psiweapon_roxanne.png
diff --git a/crawl-ref/source/dat/tiles/title_sastrei_chei.png b/crawl-ref/source/dat/tiles/title_sastrei_chei.png
diff --git a/crawl-ref/source/dat/tiles/title_shadyamish_octm.png b/crawl-ref/source/dat/tiles/title_shadyamish_octm.png
diff --git a/crawl-ref/source/dat/tiles/title_white_noise_entering_the_dungeon.png b/crawl-ref/source/dat/tiles/title_white_noise_entering_the_dungeon.png
diff --git a/crawl-ref/source/dat/tiles/title_white_noise_grabbing_the_orb.png b/crawl-ref/source/dat/tiles/title_white_noise_grabbing_the_orb.png
diff --git a/crawl-ref/source/package.json b/crawl-ref/source/package.json
@@ -0,0 +1,5 @@
+{
+    "name": "crawl",
+    "version": "0.0.1",
+    "private": "true"
+}
diff --git a/crawl-ref/source/web/.gitignore b/crawl-ref/source/web/.gitignore
@@ -0,0 +1,26 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
+
+public/crawl.*
diff --git a/crawl-ref/source/web/index.html b/crawl-ref/source/web/index.html
@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Vite + TS</title>
+  </head>
+  <body>
+    <div id="app"></div>
+    <script type="module" src="/src/main.ts"></script>
+  </body>
+</html>