Skip to content

Commit afbe750

Browse files
Lamby777Lamby777
committed
not everyone uses the same project structure as you holy shit (refactor later maybe)
1 parent aeac805 commit afbe750

File tree

1 file changed

+52
-52
lines changed

1 file changed

+52
-52
lines changed

‎grcc.mk‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ GRCC_NATIVE_DEBUG_WINDOWS_SRC=./rust/target/debug/$(GRCC_GODOT_RUST_LIB_NAME).dl
153153
GRCC_NATIVE_DEBUG_MACOSX_SRC=./rust/target/debug/lib$(GRCC_GODOT_RUST_LIB_NAME).dylib
154154
GRCC_NATIVE_DEBUG_LINUX_SRC=./rust/target/debug/lib$(GRCC_GODOT_RUST_LIB_NAME).so
155155

156-
GRCC_GODOT_GDNATIVE_DIR=./godot/gdnative
156+
GRCC_GODOT_GDNATIVE_DIR=./pets-gd/gdnative
157157
GRCC_WINDOWS_X64_SRC=./rust/target/$(GRCC_WINDOWS_X64_TARGET)/release/$(GRCC_GODOT_RUST_LIB_NAME).dll
158158
GRCC_WINDOWS_X64_DST=$(GRCC_GODOT_GDNATIVE_DIR)/windows/$(GRCC_WINDOWS_X64_TARGET)/
159159
GRCC_WINDOWS_ARM64_SRC=./rust/target/$(GRCC_WINDOWS_ARM64_TARGET)/release/$(GRCC_GODOT_RUST_LIB_NAME).dll
@@ -207,109 +207,109 @@ GRCC_DMG_VOLUME_NAME=$(GRCC_GAME_PKG_NAME)
207207
GRCC_GODOT_HEADLESS=godot --headless
208208

209209
grcc-test:
210-
cd rust && cargo test
210+
cd pets-lib && cargo test
211211

212212
grcc-debug:
213-
cd rust && cargo build
213+
cd pets-lib && cargo build
214214

215215
grcc-release:
216-
cd rust && cargo build --release
216+
cd pets-lib && cargo build --release
217217

218218
grcc-clean: grcc-clean-prepare
219219
rm -rf export
220220

221221
grcc-doc:
222-
cd rust && cargo doc --workspace --offline
222+
cd pets-lib && cargo doc --workspace --offline
223223

224224
grcc-clean-prepare:
225225
rm -rf $(GRCC_GODOT_GDNATIVE_DIR)
226-
cd rust && (cargo clean || rm -rf ./target || sudo rm -rf ./target)
226+
cd pets-lib && (cargo clean || rm -rf ./target || sudo rm -rf ./target)
227227

228228
grcc-lib-all: grcc-lib-windows grcc-lib-android grcc-lib-macosx grcc-lib-linux
229229

230230
grcc-lib-windows: grcc-lib-windows-x64 grcc-lib-windows-arm64
231231

232232
grcc-lib-windows-x64:
233233
ifeq (yes,$(GRCC_USE_DOCKER))
234-
cd rust && $(GRCC_INVOKE_DOCKER_RUST) -e C_INCLUDE_PATH=$(GRCC_WINDOWS_MINGW_HEADERS) ufoot/godot-rust-cross-compiler cargo build --release --target $(GRCC_WINDOWS_X64_TARGET)
234+
cd pets-lib && $(GRCC_INVOKE_DOCKER_RUST) -e C_INCLUDE_PATH=$(GRCC_WINDOWS_MINGW_HEADERS) ufoot/godot-rust-cross-compiler cargo build --release --target $(GRCC_WINDOWS_X64_TARGET)
235235
else
236-
export C_INCLUDE_PATH=$(GRCC_WINDOWS_MINGW_HEADERS) && cd rust && cargo build --release --target $(GRCC_WINDOWS_X64_TARGET)
236+
export C_INCLUDE_PATH=$(GRCC_WINDOWS_MINGW_HEADERS) && cd pets-lib && cargo build --release --target $(GRCC_WINDOWS_X64_TARGET)
237237
endif
238238

239239
grcc-lib-windows-arm64:
240240
ifeq (yes,$(GRCC_USE_DOCKER))
241-
cd rust && $(GRCC_INVOKE_DOCKER_RUST) ufoot/godot-rust-cross-compiler cargo build --release --target $(GRCC_WINDOWS_ARM64_TARGET)
241+
cd pets-lib && $(GRCC_INVOKE_DOCKER_RUST) ufoot/godot-rust-cross-compiler cargo build --release --target $(GRCC_WINDOWS_ARM64_TARGET)
242242
else
243-
cd rust && cargo build --release --target $(GRCC_WINDOWS_ARM64_TARGET)
243+
cd pets-lib && cargo build --release --target $(GRCC_WINDOWS_ARM64_TARGET)
244244
endif
245245

246246
grcc-lib-android: grcc-check-android-host grcc-lib-android-arm64 grcc-lib-android-arm32 grcc-lib-android-x64 grcc-lib-android-x32
247247

248248
grcc-lib-android-arm64: grcc-check-android-host
249249
ifeq (yes,$(GRCC_USE_DOCKER))
250-
cd rust && $(GRCC_INVOKE_DOCKER_RUST) ufoot/godot-rust-cross-compiler cargo build --release --target $(GRCC_ANDROID_ARM64_TARGET)
250+
cd pets-lib && $(GRCC_INVOKE_DOCKER_RUST) ufoot/godot-rust-cross-compiler cargo build --release --target $(GRCC_ANDROID_ARM64_TARGET)
251251
else
252-
cd rust && cargo build --release --target $(GRCC_ANDROID_ARM64_TARGET)
252+
cd pets-lib && cargo build --release --target $(GRCC_ANDROID_ARM64_TARGET)
253253
endif
254254

255255
grcc-lib-android-arm32: grcc-check-android-host
256256
ifeq (yes,$(GRCC_USE_DOCKER))
257-
cd rust && $(GRCC_INVOKE_DOCKER_RUST) ufoot/godot-rust-cross-compiler cargo build --release --target $(GRCC_ANDROID_ARM32_TARGET)
257+
cd pets-lib && $(GRCC_INVOKE_DOCKER_RUST) ufoot/godot-rust-cross-compiler cargo build --release --target $(GRCC_ANDROID_ARM32_TARGET)
258258
else
259-
cd rust && cargo build --release --target $(GRCC_ANDROID_ARM32_TARGET)
259+
cd pets-lib && cargo build --release --target $(GRCC_ANDROID_ARM32_TARGET)
260260
endif
261261

262262
grcc-lib-android-x64: grcc-check-android-host
263263
ifeq (yes,$(GRCC_USE_DOCKER))
264-
cd rust && $(GRCC_INVOKE_DOCKER_RUST) ufoot/godot-rust-cross-compiler cargo build --release --target $(GRCC_ANDROID_X64_TARGET)
264+
cd pets-lib && $(GRCC_INVOKE_DOCKER_RUST) ufoot/godot-rust-cross-compiler cargo build --release --target $(GRCC_ANDROID_X64_TARGET)
265265
else
266-
cd rust && cargo build --release --target $(GRCC_ANDROID_X64_TARGET)
266+
cd pets-lib && cargo build --release --target $(GRCC_ANDROID_X64_TARGET)
267267
endif
268268

269269
grcc-lib-android-x32: grcc-check-android-host
270270
ifeq (yes,$(GRCC_USE_DOCKER))
271-
cd rust && $(GRCC_INVOKE_DOCKER_RUST) ufoot/godot-rust-cross-compiler cargo build --release --target $(GRCC_ANDROID_X32_TARGET)
271+
cd pets-lib && $(GRCC_INVOKE_DOCKER_RUST) ufoot/godot-rust-cross-compiler cargo build --release --target $(GRCC_ANDROID_X32_TARGET)
272272
else
273-
cd rust && cargo build --release --target $(GRCC_ANDROID_X32_TARGET)
273+
cd pets-lib && cargo build --release --target $(GRCC_ANDROID_X32_TARGET)
274274
endif
275275

276276
grcc-lib-macosx: grcc-lib-macosx-x64 grcc-lib-macosx-arm64
277277

278278
grcc-lib-macosx-x64:
279279
ifeq (yes,$(GRCC_USE_DOCKER))
280-
cd rust && $(GRCC_INVOKE_DOCKER_RUST) -e CC=$(GRCC_MACOSX_SDK_CC_X64) -e C_INCLUDE_PATH=$(GRCC_MACOSX_SDK_HEADERS) ufoot/godot-rust-cross-compiler cargo build --release --target $(GRCC_MACOSX_X64_TARGET)
280+
cd pets-lib && $(GRCC_INVOKE_DOCKER_RUST) -e CC=$(GRCC_MACOSX_SDK_CC_X64) -e C_INCLUDE_PATH=$(GRCC_MACOSX_SDK_HEADERS) ufoot/godot-rust-cross-compiler cargo build --release --target $(GRCC_MACOSX_X64_TARGET)
281281
else
282-
export CC=$(GRCC_MACOSX_SDK_CC_X64) C_INCLUDE_PATH=$(GRCC_MACOSX_SDK_HEADERS) && cd rust && cargo build --release --target $(GRCC_MACOSX_X64_TARGET)
282+
export CC=$(GRCC_MACOSX_SDK_CC_X64) C_INCLUDE_PATH=$(GRCC_MACOSX_SDK_HEADERS) && cd pets-lib && cargo build --release --target $(GRCC_MACOSX_X64_TARGET)
283283
endif
284284

285285
grcc-lib-macosx-arm64:
286286
ifeq (yes,$(GRCC_USE_DOCKER))
287-
cd rust && $(GRCC_INVOKE_DOCKER_RUST) -e CC=$(GRCC_MACOSX_SDK_CC_ARM64) -e C_INCLUDE_PATH=$(GRCC_MACOSX_SDK_HEADERS) ufoot/godot-rust-cross-compiler cargo build --release --target $(GRCC_MACOSX_ARM64_TARGET)
287+
cd pets-lib && $(GRCC_INVOKE_DOCKER_RUST) -e CC=$(GRCC_MACOSX_SDK_CC_ARM64) -e C_INCLUDE_PATH=$(GRCC_MACOSX_SDK_HEADERS) ufoot/godot-rust-cross-compiler cargo build --release --target $(GRCC_MACOSX_ARM64_TARGET)
288288
else
289-
export CC=$(GRCC_MACOSX_SDK_CC_ARM64) C_INCLUDE_PATH=$(GRCC_MACOSX_SDK_HEADERS) && cd rust && cargo build --release --target $(GRCC_MACOSX_ARM64_TARGET)
289+
export CC=$(GRCC_MACOSX_SDK_CC_ARM64) C_INCLUDE_PATH=$(GRCC_MACOSX_SDK_HEADERS) && cd pets-lib && cargo build --release --target $(GRCC_MACOSX_ARM64_TARGET)
290290
endif
291291

292292
grcc-lib-linux: grcc-lib-linux-x64 grcc-lib-linux-arm64
293293

294294
grcc-lib-linux-x64:
295295
ifeq (yes,$(GRCC_USE_DOCKER))
296-
cd rust && $(GRCC_INVOKE_DOCKER_RUST) ufoot/godot-rust-cross-compiler cargo build --release --target $(GRCC_LINUX_X64_TARGET)
296+
cd pets-lib && $(GRCC_INVOKE_DOCKER_RUST) ufoot/godot-rust-cross-compiler cargo build --release --target $(GRCC_LINUX_X64_TARGET)
297297
else
298-
cd rust && cargo build --release --target $(GRCC_LINUX_X64_TARGET)
298+
cd pets-lib && cargo build --release --target $(GRCC_LINUX_X64_TARGET)
299299
endif
300300

301301
grcc-lib-linux-arm64:
302302
ifeq (yes,$(GRCC_USE_DOCKER))
303-
cd rust && $(GRCC_INVOKE_DOCKER_RUST) ufoot/godot-rust-cross-compiler cargo build --release --target $(GRCC_LINUX_ARM64_TARGET)
303+
cd pets-lib && $(GRCC_INVOKE_DOCKER_RUST) ufoot/godot-rust-cross-compiler cargo build --release --target $(GRCC_LINUX_ARM64_TARGET)
304304
else
305-
cd rust && cargo build --release --target $(GRCC_LINUX_ARM64_TARGET)
305+
cd pets-lib && cargo build --release --target $(GRCC_LINUX_ARM64_TARGET)
306306
endif
307307

308308
grcc-lib-wasm:
309309
ifeq (yes,$(GRCC_USE_DOCKER))
310-
cd rust && $(GRCC_INVOKE_DOCKER_RUST) ufoot/godot-rust-cross-compiler cargo build --release --target $(GRCC_WASM_TARGET)
310+
cd pets-lib && $(GRCC_INVOKE_DOCKER_RUST) ufoot/godot-rust-cross-compiler cargo build --release --target $(GRCC_WASM_TARGET)
311311
else
312-
cd rust && cargo build --release --target $(GRCC_WASM_TARGET)
312+
cd pets-lib && cargo build --release --target $(GRCC_WASM_TARGET)
313313
endif
314314
# Optimize WASM with wasm-opt
315315
ifeq (yes,$(GRCC_USE_DOCKER))
@@ -376,7 +376,7 @@ grcc-copy-wasm: grcc-lib-wasm
376376
grcc-pkg-all: grcc-pkg-windows grcc-pkg-android grcc-pkg-macosx grcc-pkg-linux grcc-pkg-wasm grcc-pkg-source
377377

378378
# [TODO] report this bug, need to launch the export twice for it to work, else complains about missing lib
379-
GRCC_PKG_BUILDX2=godot/buildx2.sh
379+
GRCC_PKG_BUILDX2=pets-gd/buildx2.sh
380380

381381
# Godot 4 export preset names (architecture-specific presets must be defined in export_presets.cfg)
382382
GRCC_EXPORT_PRESET_WINDOWS_X64=Windows Desktop x64
@@ -390,61 +390,61 @@ GRCC_EXPORT_PRESET_WEB=Web
390390
grcc-pkg-windows: grcc-pkg-windows-x64 grcc-pkg-windows-arm64
391391

392392
grcc-pkg-windows-x64: grcc-copy-windows-x64
393-
rm -f $(GRCC_EXPORT_DIR)/$(GRCC_EXPORT_WINDOWS_X64_PKG).zip godot/$(GRCC_GAME_PKG_NAME).exe godot/$(GRCC_GODOT_RUST_LIB_NAME).dll
394-
echo 'for i in warmup real ; do $(GRCC_GODOT_HEADLESS) --path godot --export-release "$(GRCC_EXPORT_PRESET_WINDOWS_X64)" $(GRCC_GAME_PKG_NAME).exe ; done' > $(GRCC_PKG_BUILDX2) && chmod a+x $(GRCC_PKG_BUILDX2) && $(GRCC_INVOKE_DOCKER_GODOT_EXPORT) sh $(GRCC_PKG_BUILDX2) && rm $(GRCC_PKG_BUILDX2)
393+
rm -f $(GRCC_EXPORT_DIR)/$(GRCC_EXPORT_WINDOWS_X64_PKG).zip pets-gd/$(GRCC_GAME_PKG_NAME).exe pets-gd/$(GRCC_GODOT_RUST_LIB_NAME).dll
394+
echo 'for i in warmup real ; do $(GRCC_GODOT_HEADLESS) --path pets-gd --export-release "$(GRCC_EXPORT_PRESET_WINDOWS_X64)" $(GRCC_GAME_PKG_NAME).exe ; done' > $(GRCC_PKG_BUILDX2) && chmod a+x $(GRCC_PKG_BUILDX2) && $(GRCC_INVOKE_DOCKER_GODOT_EXPORT) sh $(GRCC_PKG_BUILDX2) && rm $(GRCC_PKG_BUILDX2)
395395
install -d $(GRCC_EXPORT_DIR)/$(GRCC_EXPORT_WINDOWS_X64_PKG)
396-
mv godot/$(GRCC_GAME_PKG_NAME).exe godot/$(GRCC_GODOT_RUST_LIB_NAME).dll $(GRCC_EXPORT_DIR)/$(GRCC_EXPORT_WINDOWS_X64_PKG)
396+
mv pets-gd/$(GRCC_GAME_PKG_NAME).exe pets-gd/$(GRCC_GODOT_RUST_LIB_NAME).dll $(GRCC_EXPORT_DIR)/$(GRCC_EXPORT_WINDOWS_X64_PKG)
397397
cd $(GRCC_EXPORT_DIR) && zip -r $(GRCC_EXPORT_WINDOWS_X64_PKG).zip $(GRCC_EXPORT_WINDOWS_X64_PKG) && rm -rf $(GRCC_EXPORT_WINDOWS_X64_PKG)
398398

399399
grcc-pkg-windows-arm64: grcc-copy-windows-arm64
400-
rm -f $(GRCC_EXPORT_DIR)/$(GRCC_EXPORT_WINDOWS_ARM64_PKG).zip godot/$(GRCC_GAME_PKG_NAME).exe godot/$(GRCC_GODOT_RUST_LIB_NAME).dll
401-
echo 'for i in warmup real ; do $(GRCC_GODOT_HEADLESS) --path godot --export-release "$(GRCC_EXPORT_PRESET_WINDOWS_ARM64)" $(GRCC_GAME_PKG_NAME).exe ; done' > $(GRCC_PKG_BUILDX2) && chmod a+x $(GRCC_PKG_BUILDX2) && $(GRCC_INVOKE_DOCKER_GODOT_EXPORT) sh $(GRCC_PKG_BUILDX2) && rm $(GRCC_PKG_BUILDX2)
400+
rm -f $(GRCC_EXPORT_DIR)/$(GRCC_EXPORT_WINDOWS_ARM64_PKG).zip pets-gd/$(GRCC_GAME_PKG_NAME).exe pets-gd/$(GRCC_GODOT_RUST_LIB_NAME).dll
401+
echo 'for i in warmup real ; do $(GRCC_GODOT_HEADLESS) --path pets-gd --export-release "$(GRCC_EXPORT_PRESET_WINDOWS_ARM64)" $(GRCC_GAME_PKG_NAME).exe ; done' > $(GRCC_PKG_BUILDX2) && chmod a+x $(GRCC_PKG_BUILDX2) && $(GRCC_INVOKE_DOCKER_GODOT_EXPORT) sh $(GRCC_PKG_BUILDX2) && rm $(GRCC_PKG_BUILDX2)
402402
install -d $(GRCC_EXPORT_DIR)/$(GRCC_EXPORT_WINDOWS_ARM64_PKG)
403-
mv godot/$(GRCC_GAME_PKG_NAME).exe godot/$(GRCC_GODOT_RUST_LIB_NAME).dll $(GRCC_EXPORT_DIR)/$(GRCC_EXPORT_WINDOWS_ARM64_PKG)
403+
mv pets-gd/$(GRCC_GAME_PKG_NAME).exe pets-gd/$(GRCC_GODOT_RUST_LIB_NAME).dll $(GRCC_EXPORT_DIR)/$(GRCC_EXPORT_WINDOWS_ARM64_PKG)
404404
cd $(GRCC_EXPORT_DIR) && zip -r $(GRCC_EXPORT_WINDOWS_ARM64_PKG).zip $(GRCC_EXPORT_WINDOWS_ARM64_PKG) && rm -rf $(GRCC_EXPORT_WINDOWS_ARM64_PKG)
405405

406406
grcc-pkg-android: grcc-check-android-host grcc-copy-android
407-
rm -f $(GRCC_EXPORT_DIR)/$(GRCC_EXPORT_ANDROID_PKG).apk godot/$(GRCC_EXPORT_ANDROID_PKG).apk
408-
echo 'for i in warmup real ; do $(GRCC_GODOT_HEADLESS) --path godot --export-release "$(GRCC_EXPORT_PRESET_ANDROID)" $(GRCC_EXPORT_ANDROID_PKG).apk ; done' > $(GRCC_PKG_BUILDX2) && chmod a+x $(GRCC_PKG_BUILDX2) && $(GRCC_INVOKE_DOCKER_GODOT_EXPORT) sh $(GRCC_PKG_BUILDX2) && rm $(GRCC_PKG_BUILDX2)
409-
install -d $(GRCC_EXPORT_DIR) && mv godot/$(GRCC_EXPORT_ANDROID_PKG).apk $(GRCC_EXPORT_DIR)
407+
rm -f $(GRCC_EXPORT_DIR)/$(GRCC_EXPORT_ANDROID_PKG).apk pets-gd/$(GRCC_EXPORT_ANDROID_PKG).apk
408+
echo 'for i in warmup real ; do $(GRCC_GODOT_HEADLESS) --path pets-gd --export-release "$(GRCC_EXPORT_PRESET_ANDROID)" $(GRCC_EXPORT_ANDROID_PKG).apk ; done' > $(GRCC_PKG_BUILDX2) && chmod a+x $(GRCC_PKG_BUILDX2) && $(GRCC_INVOKE_DOCKER_GODOT_EXPORT) sh $(GRCC_PKG_BUILDX2) && rm $(GRCC_PKG_BUILDX2)
409+
install -d $(GRCC_EXPORT_DIR) && mv pets-gd/$(GRCC_EXPORT_ANDROID_PKG).apk $(GRCC_EXPORT_DIR)
410410

411411
grcc-pkg-macosx: grcc-copy-macosx
412-
rm -f $(GRCC_EXPORT_DIR)/$(GRCC_EXPORT_MACOSX_PKG).zip godot/$(GRCC_EXPORT_MACOSX_PKG).zip
413-
echo 'for i in warmup real ; do $(GRCC_GODOT_HEADLESS) --path godot --export-release "$(GRCC_EXPORT_PRESET_MACOSX)" $(GRCC_EXPORT_MACOSX_PKG).zip ; done' > $(GRCC_PKG_BUILDX2) && chmod a+x $(GRCC_PKG_BUILDX2) && $(GRCC_INVOKE_DOCKER_GODOT_EXPORT) sh $(GRCC_PKG_BUILDX2) && rm $(GRCC_PKG_BUILDX2)
414-
install -d $(GRCC_EXPORT_DIR) && mv godot/$(GRCC_EXPORT_MACOSX_PKG).zip $(GRCC_EXPORT_DIR)
412+
rm -f $(GRCC_EXPORT_DIR)/$(GRCC_EXPORT_MACOSX_PKG).zip pets-gd/$(GRCC_EXPORT_MACOSX_PKG).zip
413+
echo 'for i in warmup real ; do $(GRCC_GODOT_HEADLESS) --path pets-gd --export-release "$(GRCC_EXPORT_PRESET_MACOSX)" $(GRCC_EXPORT_MACOSX_PKG).zip ; done' > $(GRCC_PKG_BUILDX2) && chmod a+x $(GRCC_PKG_BUILDX2) && $(GRCC_INVOKE_DOCKER_GODOT_EXPORT) sh $(GRCC_PKG_BUILDX2) && rm $(GRCC_PKG_BUILDX2)
414+
install -d $(GRCC_EXPORT_DIR) && mv pets-gd/$(GRCC_EXPORT_MACOSX_PKG).zip $(GRCC_EXPORT_DIR)
415415

416416
grcc-pkg-linux: grcc-pkg-linux-x64 grcc-pkg-linux-arm64
417417

418418
grcc-pkg-linux-x64: grcc-copy-linux-x64
419-
rm -f $(GRCC_EXPORT_DIR)/$(GRCC_EXPORT_LINUX_X64_PKG).tar.gz godot/$(GRCC_GAME_PKG_NAME) godot/lib$(GRCC_GODOT_RUST_LIB_NAME).so
420-
echo 'for i in warmup real ; do $(GRCC_GODOT_HEADLESS) --path godot --export-release "$(GRCC_EXPORT_PRESET_LINUX_X64)" $(GRCC_GAME_PKG_NAME) ; done' > $(GRCC_PKG_BUILDX2) && chmod a+x $(GRCC_PKG_BUILDX2) && $(GRCC_INVOKE_DOCKER_GODOT_EXPORT) sh $(GRCC_PKG_BUILDX2) && rm $(GRCC_PKG_BUILDX2)
419+
rm -f $(GRCC_EXPORT_DIR)/$(GRCC_EXPORT_LINUX_X64_PKG).tar.gz pets-gd/$(GRCC_GAME_PKG_NAME) pets-gd/lib$(GRCC_GODOT_RUST_LIB_NAME).so
420+
echo 'for i in warmup real ; do $(GRCC_GODOT_HEADLESS) --path pets-gd --export-release "$(GRCC_EXPORT_PRESET_LINUX_X64)" $(GRCC_GAME_PKG_NAME) ; done' > $(GRCC_PKG_BUILDX2) && chmod a+x $(GRCC_PKG_BUILDX2) && $(GRCC_INVOKE_DOCKER_GODOT_EXPORT) sh $(GRCC_PKG_BUILDX2) && rm $(GRCC_PKG_BUILDX2)
421421
install -d $(GRCC_EXPORT_DIR)/$(GRCC_EXPORT_LINUX_X64_PKG)
422-
mv godot/$(GRCC_GAME_PKG_NAME) godot/lib$(GRCC_GODOT_RUST_LIB_NAME).so $(GRCC_EXPORT_DIR)/$(GRCC_EXPORT_LINUX_X64_PKG)
422+
mv pets-gd/$(GRCC_GAME_PKG_NAME) pets-gd/lib$(GRCC_GODOT_RUST_LIB_NAME).so $(GRCC_EXPORT_DIR)/$(GRCC_EXPORT_LINUX_X64_PKG)
423423
cd $(GRCC_EXPORT_DIR) && tar czf $(GRCC_EXPORT_LINUX_X64_PKG).tar.gz $(GRCC_EXPORT_LINUX_X64_PKG) && rm -rf $(GRCC_EXPORT_LINUX_X64_PKG)
424424

425425
grcc-pkg-linux-arm64: grcc-copy-linux-arm64
426-
rm -f $(GRCC_EXPORT_DIR)/$(GRCC_EXPORT_LINUX_ARM64_PKG).tar.gz godot/$(GRCC_GAME_PKG_NAME) godot/lib$(GRCC_GODOT_RUST_LIB_NAME).so
427-
echo 'for i in warmup real ; do $(GRCC_GODOT_HEADLESS) --path godot --export-release "$(GRCC_EXPORT_PRESET_LINUX_ARM64)" $(GRCC_GAME_PKG_NAME) ; done' > $(GRCC_PKG_BUILDX2) && chmod a+x $(GRCC_PKG_BUILDX2) && $(GRCC_INVOKE_DOCKER_GODOT_EXPORT) sh $(GRCC_PKG_BUILDX2) && rm $(GRCC_PKG_BUILDX2)
426+
rm -f $(GRCC_EXPORT_DIR)/$(GRCC_EXPORT_LINUX_ARM64_PKG).tar.gz pets-gd/$(GRCC_GAME_PKG_NAME) pets-gd/lib$(GRCC_GODOT_RUST_LIB_NAME).so
427+
echo 'for i in warmup real ; do $(GRCC_GODOT_HEADLESS) --path pets-gd --export-release "$(GRCC_EXPORT_PRESET_LINUX_ARM64)" $(GRCC_GAME_PKG_NAME) ; done' > $(GRCC_PKG_BUILDX2) && chmod a+x $(GRCC_PKG_BUILDX2) && $(GRCC_INVOKE_DOCKER_GODOT_EXPORT) sh $(GRCC_PKG_BUILDX2) && rm $(GRCC_PKG_BUILDX2)
428428
install -d $(GRCC_EXPORT_DIR)/$(GRCC_EXPORT_LINUX_ARM64_PKG)
429-
mv godot/$(GRCC_GAME_PKG_NAME) godot/lib$(GRCC_GODOT_RUST_LIB_NAME).so $(GRCC_EXPORT_DIR)/$(GRCC_EXPORT_LINUX_ARM64_PKG)
429+
mv pets-gd/$(GRCC_GAME_PKG_NAME) pets-gd/lib$(GRCC_GODOT_RUST_LIB_NAME).so $(GRCC_EXPORT_DIR)/$(GRCC_EXPORT_LINUX_ARM64_PKG)
430430
cd $(GRCC_EXPORT_DIR) && tar czf $(GRCC_EXPORT_LINUX_ARM64_PKG).tar.gz $(GRCC_EXPORT_LINUX_ARM64_PKG) && rm -rf $(GRCC_EXPORT_LINUX_ARM64_PKG)
431431

432432
grcc-pkg-wasm: grcc-copy-wasm
433433
rm -rf $(GRCC_EXPORT_DIR)/$(GRCC_EXPORT_WASM_PKG) $(GRCC_EXPORT_DIR)/$(GRCC_EXPORT_WASM_PKG).zip
434434
install -d $(GRCC_EXPORT_DIR)/$(GRCC_EXPORT_WASM_PKG)
435-
echo 'for i in warmup real ; do $(GRCC_GODOT_HEADLESS) --path godot --export-release "$(GRCC_EXPORT_PRESET_WEB)" $(GRCC_EXPORT_WASM_PKG)/index.html ; done' > $(GRCC_PKG_BUILDX2) && chmod a+x $(GRCC_PKG_BUILDX2) && $(GRCC_INVOKE_DOCKER_GODOT_EXPORT) sh $(GRCC_PKG_BUILDX2) && rm $(GRCC_PKG_BUILDX2)
436-
mv godot/$(GRCC_EXPORT_WASM_PKG) $(GRCC_EXPORT_DIR)/
435+
echo 'for i in warmup real ; do $(GRCC_GODOT_HEADLESS) --path pets-gd --export-release "$(GRCC_EXPORT_PRESET_WEB)" $(GRCC_EXPORT_WASM_PKG)/index.html ; done' > $(GRCC_PKG_BUILDX2) && chmod a+x $(GRCC_PKG_BUILDX2) && $(GRCC_INVOKE_DOCKER_GODOT_EXPORT) sh $(GRCC_PKG_BUILDX2) && rm $(GRCC_PKG_BUILDX2)
436+
mv pets-gd/$(GRCC_EXPORT_WASM_PKG) $(GRCC_EXPORT_DIR)/
437437
cd $(GRCC_EXPORT_DIR) && zip -r $(GRCC_EXPORT_WASM_PKG).zip $(GRCC_EXPORT_WASM_PKG) && rm -rf $(GRCC_EXPORT_WASM_PKG)
438438

439439
grcc-pkg-source: .git/config grcc-clean-prepare
440-
export REPO="$$(grep url .git/config | head -n 1 | cut -d = -f 2)" && install -d $(GRCC_EXPORT_DIR) && rm -f $(GRCC_EXPORT_DIR)/$(GRCC_GAME_REPO_NAME).tar && tar cf $(GRCC_EXPORT_DIR)/$(GRCC_GAME_REPO_NAME).tar --exclude=.git --exclude=export --exclude=rust/target --exclude=godot/.godot . && cd $(GRCC_EXPORT_DIR) && rm -rf $(GRCC_GAME_REPO_NAME)-$(GRCC_GAME_REPO_VERSION) && rm -f $(GRCC_GAME_REPO_NAME)-$(GRCC_GAME_REPO_VERSION).tar.gz $(GRCC_GAME_REPO_NAME)-$(GRCC_GAME_REPO_VERSION).zip && mkdir $(GRCC_GAME_REPO_NAME)-$(GRCC_GAME_REPO_VERSION) && cd $(GRCC_GAME_REPO_NAME)-$(GRCC_GAME_REPO_VERSION) && tar xf ../$(GRCC_GAME_REPO_NAME).tar && cd .. && rm $(GRCC_GAME_REPO_NAME).tar && tar czf $(GRCC_GAME_REPO_NAME)-$(GRCC_GAME_REPO_VERSION).tar.gz $(GRCC_GAME_REPO_NAME)-$(GRCC_GAME_REPO_VERSION) && zip -r $(GRCC_GAME_REPO_NAME)-$(GRCC_GAME_REPO_VERSION).zip $(GRCC_GAME_REPO_NAME)-$(GRCC_GAME_REPO_VERSION) && rm -rf $(GRCC_GAME_REPO_NAME)-$(GRCC_GAME_REPO_VERSION)
440+
export REPO="$$(grep url .git/config | head -n 1 | cut -d = -f 2)" && install -d $(GRCC_EXPORT_DIR) && rm -f $(GRCC_EXPORT_DIR)/$(GRCC_GAME_REPO_NAME).tar && tar cf $(GRCC_EXPORT_DIR)/$(GRCC_GAME_REPO_NAME).tar --exclude=.git --exclude=export --exclude=rust/target --exclude=pets-gd/.godot . && cd $(GRCC_EXPORT_DIR) && rm -rf $(GRCC_GAME_REPO_NAME)-$(GRCC_GAME_REPO_VERSION) && rm -f $(GRCC_GAME_REPO_NAME)-$(GRCC_GAME_REPO_VERSION).tar.gz $(GRCC_GAME_REPO_NAME)-$(GRCC_GAME_REPO_VERSION).zip && mkdir $(GRCC_GAME_REPO_NAME)-$(GRCC_GAME_REPO_VERSION) && cd $(GRCC_GAME_REPO_NAME)-$(GRCC_GAME_REPO_VERSION) && tar xf ../$(GRCC_GAME_REPO_NAME).tar && cd .. && rm $(GRCC_GAME_REPO_NAME).tar && tar czf $(GRCC_GAME_REPO_NAME)-$(GRCC_GAME_REPO_VERSION).tar.gz $(GRCC_GAME_REPO_NAME)-$(GRCC_GAME_REPO_VERSION) && zip -r $(GRCC_GAME_REPO_NAME)-$(GRCC_GAME_REPO_VERSION).zip $(GRCC_GAME_REPO_NAME)-$(GRCC_GAME_REPO_VERSION) && rm -rf $(GRCC_GAME_REPO_NAME)-$(GRCC_GAME_REPO_VERSION)
441441

442442
# Windows installers (NSIS)
443443
# -------------------------
444444

445445
grcc-installer-windows: grcc-installer-windows-x64 grcc-installer-windows-arm64
446446

447-
GRCC_INSTALLER_BUILDSCRIPT=godot/installer-build.sh
447+
GRCC_INSTALLER_BUILDSCRIPT=pets-gd/installer-build.sh
448448

449449
grcc-installer-windows-x64: grcc-pkg-windows-x64
450450
install -d $(GRCC_EXPORT_DIR)
@@ -479,7 +479,7 @@ grcc-installer-windows-arm64: grcc-pkg-windows-arm64
479479
# Creates a DMG from the macOS zip export
480480
# Uses genisoimage to create hybrid ISO and libdmg-hfsplus to convert to DMG
481481

482-
GRCC_DMG_BUILDSCRIPT=godot/dmg-build.sh
482+
GRCC_DMG_BUILDSCRIPT=pets-gd/dmg-build.sh
483483

484484
grcc-dmg-macosx: grcc-pkg-macosx
485485
install -d $(GRCC_EXPORT_DIR)

0 commit comments

Comments
 (0)