Skip to content

Commit

Permalink
Merge branch 'v3' of ssh://github.com/Kode/Kore into v3
Browse files Browse the repository at this point in the history
  • Loading branch information
RobDangerous committed Feb 23, 2025
2 parents 24ad9ab + 6acc0bd commit 435fb48
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
*.frag
*.comp
# Ignore deployment directories, but not the keepme files (order is important)
**/Deployment/**
!**/Deployment/keepme
**/deployment/**
!**/deployment/keepme
compile_commands.json
.vscode/**
**/Deployment/**
!**/Deployment/keepme*
**/deployment/**
!**/deployment/keepme*
Empty file removed deployment/keepme
Empty file.
2 changes: 1 addition & 1 deletion includes/kore3/io/filereader.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ extern "C" {
#endif

#ifndef KINC_DEBUGDIR
#define KINC_DEBUGDIR "Deployment"
#define KINC_DEBUGDIR "deployment"
#endif

#ifdef KINC_ANDROID
Expand Down
1 change: 0 additions & 1 deletion kfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,6 @@ if (!a3) {
}
}

project.setDebugDir('Deployment');
project.kincProcessed = true;

if (plugin) {
Expand Down

0 comments on commit 435fb48

Please sign in to comment.