dev server

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

Hide file tree

Showing 7 changed files with 585 additions and 12 deletions.
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 -sALLOW_MEMORY_GROWTH=1 -sMAXIMUM_MEMORY=1gb -lworkerfs.js
+LDFLAGS := -sLEGACY_GL_EMULATION -sALLOW_MEMORY_GROWTH=1 -sMAXIMUM_MEMORY=1gb -lworkerfs.js -sMAX_WEBGL_VERSION=2 -sGL_UNSAFE_OPTS=0
 endif
 
 #
@@ -333,7 +333,8 @@ all: greet check-fonts $(GAME) docs webserver
 
 # XX these are set wrong on mac cross-compiling
 LIBPCRE := contrib/install/$(ARCH)/lib/libpcre.a
-LIBSDL2 :=
+# LIBSDL2 :=
+LIBSDL2 := contrib/sdl/build/libSDL2.a
 # LIBSDL2 := contrib/install/$(ARCH)/lib/libSDL2.a
 LIBPNG := contrib/install/$(ARCH)/lib/libpng.a
 LIBSDL2IMAGE :=
@@ -527,7 +528,7 @@ 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=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 := emcc -O3 -pthread -sSHARED_MEMORY=1 -sUSE_ZLIB=1 -sUSE_SDL_IMAGE=2 -sUSE_FREETYPE=1
 # GCC := $(LMACH)$(GCC_VER_PREFIX)emcc$(GCC_VER_SUFFIX)
 endif
 
@@ -538,7 +539,7 @@ 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=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 := em++ -O3 -pthread -sSHARED_MEMORY=1 -sUSE_ZLIB=1 -sUSE_SDL_IMAGE=2 -sUSE_FREETYPE=1
 # GXX := $(LMACH)$(GCC_VER_PREFIX)em++$(GCC_VER_SUFFIX)
 endif
 
@@ -1682,7 +1683,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/des --preload-file dat/tiles --preload-file dat/clua --preload-file dat/dlua --use-preload-plugins
+	+$(QUIET_LINK)$(CXX) $(LDFLAGS) $(GAME_OBJS) -o $(GAME).html $(LIBS) --preload-file dat --use-preload-plugins
 
 util/monster/vault_monster_data.h: dat/des util/gather_mons
 	util/gather_mons -v > $@

diff --git a/crawl-ref/source/web/.gitignore b/crawl-ref/source/web/.gitignore
@@ -22,5 +22,3 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
-
-public/crawl.*
diff --git a/crawl-ref/source/web/package-lock.json b/crawl-ref/source/web/package-lock.json
diff --git a/crawl-ref/source/web/package.json b/crawl-ref/source/web/package.json
@@ -1,7 +1,7 @@
 {
   "name": "crawl",
   "private": true,
-  "version": "0.0.0",
+  "version": "0.0.1",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -10,6 +10,7 @@
   },
   "devDependencies": {
     "typescript": "~5.7.2",
-    "vite": "^6.2.0"
+    "vite": "^6.2.0",
+    "vite-plugin-cross-origin-isolation": "^0.1.6"
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,5 +22,3 @@ dist-ssr @@
     *.njsproj
     *.sln
     *.sw?
-    public/crawl.*