Skip to content

Commit 93ea41f

Browse files
author
icex2
committed
wip
1 parent 017caab commit 93ea41f

456 files changed

Lines changed: 4575 additions & 2049 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Dockerfile renamed to Dockerfile.build

File renamed without changes.

‎Dockerfile.dev‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
FROM --platform=amd64 debian:11.6-slim@sha256:f7d141c1ec6af549958a7a2543365a7829c2cdc4476308ec2e182f8a7c59b519
2+
3+
LABEL description="Development environment for bemanitools"
4+
5+
# mingw-w64-gcc has 32-bit and 64-bit toolchains
6+
RUN apt-get update && apt-get install -y --no-install-recommends \
7+
mingw-w64 \
8+
mingw-w64-common \
9+
make \
10+
zip \
11+
git \
12+
clang-format \
13+
python3-pip \
14+
&& rm -rf /var/lib/apt/lists/*
15+
16+
RUN pip3 install mdformat
17+
18+
RUN mkdir /bemanitools
19+
WORKDIR /bemanitools
20+
21+
ENV SHELL /bin/bash

‎GNUmakefile‎

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ BUILDDIR ?= build
1313

1414
builddir_docker := $(BUILDDIR)/docker
1515

16-
docker_container_name := "bemanitools-build"
17-
docker_image_name := "bemanitools-build:latest"
16+
docker_build_container_name := "bemanitools-build"
17+
docker_build_image_name := "bemanitools-build:latest"
18+
docker_dev_container_name := "bemanitools-dev"
19+
docker_dev_image_name := "bemanitools-dev:latest"
1820

1921
depdir := $(BUILDDIR)/dep
2022
objdir := $(BUILDDIR)/obj
@@ -41,6 +43,7 @@ FORCE:
4143

4244
.PHONY: \
4345
build-docker \
46+
dev-docker \
4447
clean \
4548
code-format \
4649
print-building \
@@ -83,21 +86,38 @@ version:
8386
$(V)echo "$(gitrev)" > version
8487

8588
build-docker:
86-
$(V)docker rm -f $(docker_container_name) 2> /dev/null || true
89+
$(V)docker rm -f $(docker_build_container_name) 2> /dev/null || true
8790
$(V)docker \
8891
build \
89-
-t $(docker_image_name) \
90-
-f Dockerfile \
92+
-t $(docker_build_image_name) \
93+
-f Dockerfile.build \
9194
.
9295
$(V)docker \
9396
run \
9497
--volume $(shell pwd):/bemanitools \
95-
--name $(docker_container_name) \
96-
$(docker_image_name)
98+
--name $(docker_build_container_name) \
99+
$(docker_build_image_name)
100+
101+
dev-docker:
102+
$(V)docker rm -f $(docker_dev_container_name) 2> /dev/null || true
103+
$(V)docker \
104+
build \
105+
-t $(docker_dev_image_name) \
106+
-f Dockerfile.dev \
107+
.
108+
$(V)docker \
109+
run \
110+
--interactive \
111+
--tty \
112+
--volume $(shell pwd):/bemanitools \
113+
--name $(docker_dev_container_name) \
114+
$(docker_dev_image_name)
97115

98116
clean-docker:
99-
$(V)docker rm -f $(docker_container_name) || true
100-
$(V)docker image rm -f $(docker_image_name) || true
117+
$(V)docker rm -f $(docker_dev_container_name) || true
118+
$(V)docker image rm -f $(docker_dev_image_name) || true
119+
$(V)docker rm -f $(docker_build_container_name) || true
120+
$(V)docker image rm -f $(docker_build_image_name) || true
101121
$(V)rm -rf $(BUILDDIR)
102122

103123
#

‎Module.mk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ include src/main/bstio/Module.mk
100100
include src/main/camhook/Module.mk
101101
include src/main/cconfig/Module.mk
102102
include src/main/config/Module.mk
103+
include src/main/core/Module.mk
103104
include src/main/d3d9-util/Module.mk
104105
include src/main/d3d9exhook/Module.mk
105106
include src/main/ddrhook-util/Module.mk

‎README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,10 @@ as well. Some hooks also include fixes required to run the games on a more recen
142142

143143
Depending on the game, you also need the following dependencies installed:
144144

145+
TODO: for 32-bit games: 2010, 2013 and 2015
146+
for 64-bit games: 2010, 2013 and 2015
147+
TODO link them below + have unpacked variants in btools supplement?
148+
145149
* The 32-bit (x86) version of
146150
[Microsoft Visual C++ 2010 Service Pack 1 Redistributable Package MFC Security Update](https://www.microsoft.com/en-sg/download/details.aspx?id=26999)
147151
* The 32-bit (x86) and 64-bit (x64) versions of

‎dist/iidx/gamestart-18.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ set PATH=^
3131
:: Current working dir is the game's root folder
3232
cd /d %CONTENT_DIR%
3333

34-
%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-18.xml --config iidxhook-18.conf %*
34+
%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-18.xml --config %BEMANITOOLS_DIR%\iidxhook-18.conf %*

‎dist/iidx/gamestart-19.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ set PATH=^
3131
:: Current working dir is the game's root folder
3232
cd /d %CONTENT_DIR%
3333

34-
%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-19.xml --config iidxhook-19.conf %*
34+
%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-19.xml --config %BEMANITOOLS_DIR%\iidxhook-19.conf %*

‎dist/iidx/gamestart-20.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ set PATH=^
3131
:: Current working dir is the game's root folder
3232
cd /d %CONTENT_DIR%
3333

34-
%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-20.xml --config iidxhook-20.conf %*
34+
%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-20.xml --config %BEMANITOOLS_DIR%\iidxhook-20.conf %*

‎dist/iidx/gamestart-21.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ set PATH=^
3131
:: Current working dir is the game's root folder
3232
cd /d %CONTENT_DIR%
3333

34-
%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-21.xml --config iidxhook-21.conf %*
34+
%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-21.xml --config %BEMANITOOLS_DIR%\iidxhook-21.conf %*

‎dist/iidx/gamestart-22.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ set PATH=^
3131
:: Current working dir is the game's root folder
3232
cd /d %CONTENT_DIR%
3333

34-
%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-22.xml --config iidxhook-22.conf %*
34+
%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-22.xml --config %BEMANITOOLS_DIR%\iidxhook-22.conf %*

0 commit comments

Comments
 (0)