mirror of
https://github.com/open-goal/jak-project.git
synced 2024-10-20 11:26:18 -04:00
Fix GCC build (#1992)
Not sure why but using the static members here caused a linker error, but they're only used in one place so I just passed them as constants.
This commit is contained in:
parent
b9924e5501
commit
3b3ed9efbe
|
@ -21,13 +21,13 @@ using namespace decompiler;
|
||||||
|
|
||||||
void FormRegressionTestJak1::SetUpTestCase() {
|
void FormRegressionTestJak1::SetUpTestCase() {
|
||||||
parser = std::make_unique<InstructionParser>();
|
parser = std::make_unique<InstructionParser>();
|
||||||
dts = std::make_unique<DecompilerTypeSystem>(game_version);
|
dts = std::make_unique<DecompilerTypeSystem>(GameVersion::Jak1);
|
||||||
dts->parse_type_defs({"decompiler", "config", "all-types.gc"});
|
dts->parse_type_defs({"decompiler", "config", "all-types.gc"});
|
||||||
}
|
}
|
||||||
|
|
||||||
void FormRegressionTestJak2::SetUpTestCase() {
|
void FormRegressionTestJak2::SetUpTestCase() {
|
||||||
parser = std::make_unique<InstructionParser>();
|
parser = std::make_unique<InstructionParser>();
|
||||||
dts = std::make_unique<DecompilerTypeSystem>(game_version);
|
dts = std::make_unique<DecompilerTypeSystem>(GameVersion::Jak2);
|
||||||
dts->parse_type_defs({"decompiler", "config", "jak2", "all-types.gc"});
|
dts->parse_type_defs({"decompiler", "config", "jak2", "all-types.gc"});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -100,14 +100,10 @@ class FormRegressionTest : public ::testing::TestWithParam<GameVersion> {
|
||||||
|
|
||||||
class FormRegressionTestJak1 : public FormRegressionTest {
|
class FormRegressionTestJak1 : public FormRegressionTest {
|
||||||
protected:
|
protected:
|
||||||
static const GameVersion game_version = GameVersion::Jak1;
|
|
||||||
|
|
||||||
static void SetUpTestCase();
|
static void SetUpTestCase();
|
||||||
};
|
};
|
||||||
|
|
||||||
class FormRegressionTestJak2 : public FormRegressionTest {
|
class FormRegressionTestJak2 : public FormRegressionTest {
|
||||||
protected:
|
protected:
|
||||||
static const GameVersion game_version = GameVersion::Jak2;
|
|
||||||
|
|
||||||
static void SetUpTestCase();
|
static void SetUpTestCase();
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue