Fix includes of .inc files, add src/ to includes

This commit is contained in:
LagoLunatic
2023-10-22 21:41:05 -04:00
parent 822f2af128
commit 74944b4a81
6 changed files with 33 additions and 30 deletions
+1
View File
@@ -154,6 +154,7 @@ cflags_base = [
"-str reuse",
"-multibyte",
"-i include",
"-i src",
f"-DVERSION={version_num}",
]
if config.debug:
+4 -2
View File
@@ -46,7 +46,8 @@ Recommended `.vscode/c_cpp_properties.json`:
{
"name": "Linux",
"includePath": [
"${workspaceFolder}/include/**"
"${workspaceFolder}/include/**",
"${workspaceFolder}/src/**"
],
"cStandard": "c99",
"cppStandard": "c++98",
@@ -55,7 +56,8 @@ Recommended `.vscode/c_cpp_properties.json`:
"configurationProvider": "ms-vscode.makefile-tools",
"browse": {
"path": [
"${workspaceFolder}/include"
"${workspaceFolder}/include",
"${workspaceFolder}/src"
],
"limitSymbolsToIncludedHeaders": true
}
+1 -1
View File
@@ -1147,7 +1147,7 @@ BOOL daBomb_Delete(daBomb_c* i_this) {
return true;
}
#include "src/d/actor/d_a_bomb3.inc"
#include "d/actor/d_a_bomb3.inc"
int daBomb_createHeap(fopAc_ac_c* i_this) {
static_cast<daBomb_c*>(i_this)->createHeap();
+25 -25
View File
@@ -17,7 +17,7 @@
#include "JSystem/JKernel/JKRSolidHeap.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "src/d/actor/d_a_player_HIO.inc"
#include "d/actor/d_a_player_HIO.inc"
char l_arcName[] = "Link";
@@ -1942,53 +1942,53 @@ BOOL daPy_lk_c::getBokoFlamePos(cXyz*) {
/* Nonmatching */
}
#include "src/d/actor/d_a_player_particle.inc"
#include "d/actor/d_a_player_particle.inc"
#include "src/d/actor/d_a_player_dproc.inc"
#include "d/actor/d_a_player_dproc.inc"
#include "src/d/actor/d_a_player_ladder.inc"
#include "d/actor/d_a_player_ladder.inc"
#include "src/d/actor/d_a_player_hang.inc"
#include "d/actor/d_a_player_hang.inc"
#include "src/d/actor/d_a_player_climb.inc"
#include "d/actor/d_a_player_climb.inc"
#include "src/d/actor/d_a_player_whide.inc"
#include "d/actor/d_a_player_whide.inc"
#include "src/d/actor/d_a_player_crawl.inc"
#include "d/actor/d_a_player_crawl.inc"
#include "src/d/actor/d_a_player_grab.inc"
#include "d/actor/d_a_player_grab.inc"
#include "src/d/actor/d_a_player_swim.inc"
#include "d/actor/d_a_player_swim.inc"
#include "src/d/actor/d_a_player_battle.inc"
#include "d/actor/d_a_player_battle.inc"
#include "src/d/actor/d_a_player_ship.inc"
#include "d/actor/d_a_player_ship.inc"
#include "src/d/actor/d_a_player_rope.inc"
#include "d/actor/d_a_player_rope.inc"
#include "src/d/actor/d_a_player_boomerang.inc"
#include "d/actor/d_a_player_boomerang.inc"
#include "src/d/actor/d_a_player_bow.inc"
#include "d/actor/d_a_player_bow.inc"
#include "src/d/actor/d_a_player_hook.inc"
#include "d/actor/d_a_player_hook.inc"
#include "src/d/actor/d_a_player_fan.inc"
#include "d/actor/d_a_player_fan.inc"
#include "src/d/actor/d_a_player_tact.inc"
#include "d/actor/d_a_player_tact.inc"
#include "src/d/actor/d_a_player_vomit.inc"
#include "d/actor/d_a_player_vomit.inc"
#include "src/d/actor/d_a_player_hammer.inc"
#include "d/actor/d_a_player_hammer.inc"
#include "src/d/actor/d_a_player_pushpull.inc"
#include "d/actor/d_a_player_pushpull.inc"
#include "src/d/actor/d_a_player_bottle.inc"
#include "d/actor/d_a_player_bottle.inc"
#include "src/d/actor/d_a_player_weapon.inc"
#include "d/actor/d_a_player_weapon.inc"
#include "src/d/actor/d_a_player_food.inc"
#include "d/actor/d_a_player_food.inc"
#include "src/d/actor/d_a_player_sword.inc"
#include "d/actor/d_a_player_sword.inc"
actor_method_class l_daPy_Method = {
(process_method_func)daPy_Create,
+1 -1
View File
@@ -24,7 +24,7 @@
class sub_kankyo__class : public kankyo_class {
};
#include "src/d/d_kankyo_dayproc.inc"
#include "d/d_kankyo_dayproc.inc"
// stripped or compiler generated?
static Vec unused_lit_2100[] = {1.0f, 1.0f, 1.0f};
+1 -1
View File
@@ -25,7 +25,7 @@
#include "dolphin/dvd/DVD.h"
#include "dolphin/gx/GX.h"
#include "src/f_pc/f_pc_manager_data.inc"
#include "f_pc/f_pc_manager_data.inc"
/* 8003E318-8003E338 .text fpcM_Draw__FPv */
void fpcM_Draw(void* i_proc) {