Go back to one single main for both pages (to leverage the browser's cache, since a good deal of code will be shared anyway), have GNU Make keep track of all JS depenendencies even in subdirectories, ignore compilation products

This commit is contained in:
Tissevert 2020-01-12 16:50:51 +01:00
parent 16b356a92b
commit cc8d9e096f
5 changed files with 13 additions and 7 deletions

3
.gitignore vendored
View File

@ -1,3 +1,2 @@
game.js main.js
index.js
skin.css skin.css

View File

@ -1,12 +1,14 @@
PACKAGES=unitJS PACKAGES=unitJS
TARGETS=index.js game.js skin.css SRC=js
JS_CODE=$(shell find $(SRC) -type f -name '*.js')
TARGETS=main.js skin.css
.PHONY: mrproper .PHONY: mrproper
all: $(TARGETS) all: $(TARGETS)
%.js: js/ main.js: $(JS_CODE)
sjw -o $@ $(PACKAGES:%=-I %) -m Main.$(@:%.js=%) $^ sjw -o $@ $(PACKAGES:%=-I %) $(SRC)
skin.css: skin/ skin.css: skin/
cat $^*.css > $@ cat $^*.css > $@

View File

@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>KoiKoi</title> <title>KoiKoi</title>
<script src="game.js"></script> <script src="main.js"></script>
<link rel="stylesheet" href="skin.css" type="text/css"/> <link rel="stylesheet" href="skin.css" type="text/css"/>
</head> </head>
<body> <body>

View File

@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>KoiKoi</title> <title>KoiKoi</title>
<script src="index.js"></script> <script src="main.js"></script>
<link rel="stylesheet" href="skin.css" type="text/css"/> <link rel="stylesheet" href="skin.css" type="text/css"/>
</head> </head>
<body> <body>

5
js/Main.js Normal file
View File

@ -0,0 +1,5 @@
import * as Login from GUI.Screen.Login;
import * as Hall from GUI.Screen.Hall;
Login.init();
Hall.init();