minor updates
add fruit class update simple sprites include variant type
This commit is contained in:
@@ -17,7 +17,8 @@ LDFLAGS = -L./external/raylib/lib \
|
||||
WEB_LDFLAGS = -L./external/raylib-web/lib \
|
||||
-L./external/asset_packer/bin \
|
||||
-sUSE_GLFW=3 \
|
||||
--preload-file $(ASSETS)
|
||||
--preload-file $(ASSETS) \
|
||||
--shell-file "./html/shell_custom.html"
|
||||
|
||||
LIBS = -lraylib -lwinmm -lgdi32 -lbox2d -lassetpacker
|
||||
|
||||
@@ -60,6 +61,7 @@ IMGUI_BACKEND = ./external/rlImGui/rlImGui.cpp
|
||||
SRC_FILES = ./src/asset.cpp \
|
||||
./src/movement.cpp \
|
||||
./src/player.cpp \
|
||||
./src/fruit.cpp \
|
||||
./src/render.cpp \
|
||||
./src/scenes/scene.cpp \
|
||||
./src/scenes/game_play_scene.cpp \
|
||||
@@ -75,7 +77,7 @@ OBJS_FILES = $(patsubst ./src/%.cpp,./bin/%.o,$(SRC_FILES))
|
||||
DEP_FILES = $(patsubst ./bin/%.o,./bin/%.d,$(OBJS_FILES))
|
||||
|
||||
|
||||
all: build-game run-desktop
|
||||
all: build-desktop run-desktop
|
||||
|
||||
./bin/%.o: ./external/imgui/%.cpp
|
||||
@mkdir -p bin
|
||||
@@ -110,7 +112,7 @@ build-gui-backend: $(IMGUI_BACKEND_OBJS)
|
||||
|
||||
build-core: $(OBJS_FILES)
|
||||
|
||||
build-game: $(OBJS_FILES) $(IMGUI_OBJS) $(IMGUI_BACKEND_OBJS)
|
||||
build-desktop: $(OBJS_FILES) $(IMGUI_OBJS) $(IMGUI_BACKEND_OBJS)
|
||||
@mkdir -p bin
|
||||
$(CXX) $(CXXFLAGS) $(INCLUDES) $(ENTRY_POINT) $(OBJS_FILES) $(IMGUI_OBJS) $(IMGUI_BACKEND_OBJS) $(LDFLAGS) $(LIBS) -o ./bin/main.exe
|
||||
cp ./assets ./bin -rf
|
||||
@@ -128,11 +130,11 @@ build-debug:
|
||||
|
||||
web:
|
||||
@mkdir -p web
|
||||
$(WEB_CXX) $(CXXFLAGS) $(WEB_INCLUDES) $(ENTRY_POINT) $(SRC_FILES) $(IMGUI_SRCS) $(IMGUI_BACKEND) $(WEB_LDFLAGS) $(WEB_LIBS) -o ./web/web.html
|
||||
$(WEB_CXX) $(CXXFLAGS) $(WEB_INCLUDES) $(ENTRY_POINT) $(SRC_FILES) $(IMGUI_SRCS) $(IMGUI_BACKEND) $(WEB_LDFLAGS) $(WEB_LIBS) -o ./web/index.html
|
||||
|
||||
web-native:
|
||||
@mkdir -p web
|
||||
em++ $(CXXFLAGS) $(WEB_INCLUDES) $(ENTRY_POINT) $(SRC_FILES) $(IMGUI_SRCS) $(IMGUI_BACKEND) $(WEB_LDFLAGS) $(WEB_LIBS) -o ./web/web.html
|
||||
em++ $(CXXFLAGS) $(WEB_INCLUDES) $(ENTRY_POINT) $(SRC_FILES) $(IMGUI_SRCS) $(IMGUI_BACKEND) $(WEB_LDFLAGS) $(WEB_LIBS) -o ./web/index.html
|
||||
|
||||
clean-desktop:
|
||||
@rm -r -f ./bin
|
||||
@@ -155,7 +157,7 @@ open-browser:
|
||||
start-server:
|
||||
$(WSL) python -m http.server 3000 -d ./web
|
||||
run-web:
|
||||
$(BROWSER) http://localhost:3000/web.html
|
||||
$(BROWSER) http://localhost:3000/index.html
|
||||
$(WSL) python -m http.server 3000 -d ./web
|
||||
# $(WSL) node ./web/web.js
|
||||
|
||||
@@ -165,3 +167,8 @@ run-debug:
|
||||
run-test: build-test
|
||||
./bin/test.exe
|
||||
|
||||
pack-assets:
|
||||
./external/asset_packer/bin/assetpacker.exe assets/
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user