Skip to content

Add support for fftools/resources #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add support for fftools/resources #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3748006
Add bin2c.exe tool
softworkz Jun 11, 2025
b0c12bf
Add support for CUDA compilation via NVCC
softworkz Jun 11, 2025
c0db1ec
Add support for fftools/resources
softworkz Jun 11, 2025
a615956
Merge branch 'master' into submit_cuda_plus_resources
softworkz Jun 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,5 @@
*.ilk
[Bb]in/*
!smp_*
*Caches/
*Caches/
!bin2c.exe
Binary file added bin2c.exe
View file
Open in desktop
Binary file not shown.
32 changes: 32 additions & 0 deletions include/projectGenerator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,38 @@ class ProjectGenerator
*/
void outputCUDATools(string& projectTemplate) const;

/**
* Output CUDA source files with custom build steps.
* @param [in,out] fileList The list of CUDA files to process.
* @param [in,out] projectTemplate The project template.
* @param [in,out] filterTemplate The filter template.
* @param [in,out] foundObjects The list of found object files.
* @param [in,out] foundFilters The set of found filters.
* @param staticOnly True to only include in static builds.
* @param sharedOnly True to only include in shared builds.
* @param bit32Only True to only include in 32-bit builds.
* @param bit64Only True to only include in 64-bit builds.
*/
void outputCUDASourceFiles(StaticList& fileList, string& projectTemplate, string& filterTemplate,
StaticList& foundObjects, set<string>& foundFilters, bool staticOnly = false, bool sharedOnly = false,
bool bit32Only = false, bool bit64Only = false) const;

/**
* Output resource source files (HTML/CSS) with custom build steps.
* @param [in,out] fileList The list of resource files to process.
* @param [in,out] projectTemplate The project template.
* @param [in,out] filterTemplate The filter template.
* @param [in,out] foundObjects The list of found object files.
* @param [in,out] foundFilters The set of found filters.
* @param staticOnly True to only include in static builds.
* @param sharedOnly True to only include in shared builds.
* @param bit32Only True to only include in 32-bit builds.
* @param bit64Only True to only include in 64-bit builds.
*/
void outputResourceSourceFiles(StaticList& fileList, string& projectTemplate, string& filterTemplate,
StaticList& foundObjects, set<string>& foundFilters, bool staticOnly = false, bool sharedOnly = false,
bool bit32Only = false, bool bit64Only = false) const;

bool outputDependencyLibs(string& projectTemplate, bool winrt, bool program);

/**
Expand Down
3 changes: 3 additions & 0 deletions project_generate.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@
<ItemGroup>
<ResourceCompile Include="source\Templates.rc" />
</ItemGroup>
<ItemGroup>
<None Include="bin2c.exe" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{FA1D2C31-D809-4021-9DE4-7552704175EE}</ProjectGuid>
<RootNamespace>ffmpeg_generate</RootNamespace>
Expand Down
3 changes: 3 additions & 0 deletions project_generate.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,7 @@
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<None Include="bin2c.exe" />
</ItemGroup>
</Project>
Binary file modified source/Templates.rc
View file
Open in desktop
Binary file not shown.
433 changes: 424 additions & 9 deletions source/projectGenerator.cpp
View file
Open in desktop

Large diffs are not rendered by default.

147 changes: 145 additions & 2 deletions source/projectGenerator_pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,17 @@ bool ProjectGenerator::passMake()
return false;
}
}
} else if (m_inLine.substr(0, 11) == "OBJS-resman") {
// Find position after "+="
uint startPos = m_inLine.find("+=");
if (startPos != string::npos) {
startPos += 2; // Skip past "+="
// Found resource manager objects - store for later resolution
if (!passStaticInclude(startPos, m_unknowns["OBJS-resman"])) {
m_inputFile.close();
return false;
}
}
} else if (m_inLine.substr(0, 7) == "HEADERS") {
// Found some headers
if (m_inLine.at(7) == '-') {
Expand Down Expand Up @@ -681,7 +692,7 @@ bool ProjectGenerator::passMake()
}
makeFiles.push_back(newMake);
// Add to internal list of known subdirectories
const uint rootPos = newMake.find(m_configHelper.m_rootDirectory);
const uint rootPos = newMake.find(m_configHelper.m_rootDirectory);
if (rootPos != string::npos) {
newMake.erase(rootPos, m_configHelper.m_rootDirectory.length());
}
Expand Down Expand Up @@ -720,6 +731,8 @@ bool ProjectGenerator::passMake()
bool ProjectGenerator::passProgramMake()
{
uint checks = 2;
vector<string> makeFiles; // Track additional includes

while (checks >= 1) {
// Open the input Makefile
string makeFile = m_projectDir + "MakeFile";
Expand Down Expand Up @@ -810,9 +823,133 @@ bool ProjectGenerator::passProgramMake()
return false;
}
}
} else if (m_inLine.substr(0, 11) == "OBJS-resman") {
// Find position after "+="
uint startPos = m_inLine.find("+=");
if (startPos != string::npos) {
startPos += 2; // Skip past "+="
// Found resource manager objects - store for later resolution
if (!passStaticInclude(startPos, m_unknowns["OBJS-resman"])) {
m_inputFile.close();
return false;
}
}
} else if (m_inLine.substr(0, 7) == "include" || m_inLine.substr(0, 8) == "-include") {
// Need to append the included file to makefile list
uint startPos = m_inLine.find_first_not_of(" \t", 7 + (m_inLine[0] == '-' ? 1 : 0));
uint endPos = m_inLine.find_first_of(" \t\n\r", startPos + 1);
endPos = (endPos == string::npos) ? endPos : endPos - startPos;
string newMake = m_inLine.substr(startPos, endPos);

// Check if this include contains function parameters (like $(1), $(2), etc.) and skip it
if (newMake.find("$(1)") != string::npos || newMake.find("$(2)") != string::npos ||
newMake.find("$(3)") != string::npos || newMake.find("$(prog)") != string::npos ||
newMake.find("$(P)") != string::npos) {
continue; // Skip this include as it's part of a Make function definition
}

// Perform token substitution
startPos = newMake.find('$');
while (startPos != string::npos) {
endPos = newMake.find(')', startPos + 1);
if (endPos == string::npos) {
outputError("Invalid token in include (" + newMake + ")");
return false;
}
++endPos;
string token = newMake.substr(startPos, endPos - startPos);
if (token == "$(SRC_PATH)") {
newMake.replace(startPos, endPos - startPos, m_configHelper.m_rootDirectory);
} else if (token == "$(ARCH)") {
newMake.replace(startPos, endPos - startPos, "x86");
} else {
outputError("Unknown token in include (" + token + ")");
return false;
}
startPos = newMake.find('$', startPos);
}

makeFiles.push_back(newMake);
}
}
m_inputFile.close();

// Process any included makefiles
while (!makeFiles.empty()) {
const string includedMakeFile = makeFiles.back();
makeFiles.pop_back();
outputLine(" Generating from Makefile (" + includedMakeFile + ")...");

// Open the included Makefile
ifstream includedFile(includedMakeFile);
if (includedFile.is_open()) {
string includedLine;
while (getline(includedFile, includedLine)) {
// Process OBJS-resman lines in included files
if (includedLine.length() >= 11 && includedLine.substr(0, 11) == "OBJS-resman") {
// Only process OBJS-resman for ffmpeg project
if (m_projectName == "ffmpeg") {
// Handle multi-line declarations directly here instead of using passStaticInclude
// to avoid file context mismatch
string fullLine = includedLine;

// Read continuation lines from the included file
while (fullLine.back() == '\\') {
string nextLine;
if (getline(includedFile, nextLine)) {
fullLine += " " + nextLine; // Append with space
} else {
break; // No more lines
}
}

// Now parse the complete line manually
uint startPos = fullLine.find("+=");
if (startPos != string::npos) {
startPos += 2; // Skip past "+="

// Parse files from the line
uint pos = fullLine.find_first_not_of("+=: \t", startPos);
while (pos != string::npos && pos < fullLine.length()) {
// Skip backslashes and whitespace
if (fullLine[pos] == '\\' || fullLine[pos] == ' ' || fullLine[pos] == '\t') {
pos = fullLine.find_first_not_of(" \t\\", pos + 1);
continue;
}

// Find end of current file
uint endPos = fullLine.find_first_of(" \t\\", pos);
if (endPos == string::npos) {
endPos = fullLine.length();
}

string file = fullLine.substr(pos, endPos - pos);
if (!file.empty() && file != "+=" && file != "OBJS-resman") {
// Special handling for resman.o - convert to resman since it's a real source file
if (file == "fftools/resources/resman.o") {
string sourceFile = "fftools/resources/resman";
m_includes.push_back(sourceFile);
outputInfo("Found Static: '" + sourceFile + ".c' (converted from resman.o)");
}

// Store in unknowns for $(OBJS-resman) resolution
// These are object files that will be resolved when $(OBJS-resman) is encountered
m_unknowns["OBJS-resman"].push_back(file);
outputInfo("Found Static: '" + file + "' (stored for $(OBJS-resman) resolution)");
}

pos = fullLine.find_first_not_of(" \t\\", endPos);
}
}
}
}
}
includedFile.close();
} else {
outputInfo("Could not open included MakeFile (" + includedMakeFile + ")");
}
}

if (checks == 2) {
string ignored;
const string makeFolder = "fftools/";
Expand All @@ -829,9 +966,15 @@ bool ProjectGenerator::passProgramMake()
uint uiPos;
for (auto i = m_includes.begin(); i < m_includes.end(); ++i) {
if ((uiPos = i->find(makeFolder)) != string::npos) {
i->erase(uiPos, makeFolder.length());
// Don't strip fftools/ prefix from resman as it's a real source file in that location
if (*i != "fftools/resources/resman") {
i->erase(uiPos, makeFolder.length());
} else {
// Keep full path for resman.c
}
}
}

--checks;
}

Expand Down