Skip to content

Commit

Permalink
- fix: in linux, projects no need of winres to be built
Browse files Browse the repository at this point in the history
update debian pacakges files
  • Loading branch information
Roy Qu authored and Roy Qu committed Jan 15, 2022
1 parent 6be9190 commit 6209b1f
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 3 deletions.
1 change: 1 addition & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ Red Panda C++ Version 0.13.2
- fix: open a project file through "File"->"Open" will not correctly connect it with the project internally
- fix: wrong project program directory parameter is sent to the debugger
- enhancement: better behavior of mouse tips
- fix: in linux, projects no need of winres to be built

Red Panda C++ Version 0.13.1
- enhancement: suppoort localization info in project templates
Expand Down
6 changes: 6 additions & 0 deletions RedPandaIDE/compiler/projectcompiler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -176,13 +176,15 @@ void ProjectCompiler::writeMakeDefines(QFile &file)

// Get windres file
QString ObjResFile;
#ifdef Q_OS_WIN
if (!mProject->options().privateResource.isEmpty()) {
if (!mProject->options().objectOutput.isEmpty()) {
ObjResFile = includeTrailingPathDelimiter(mProject->options().objectOutput) +
changeFileExt(mProject->options().privateResource, RES_EXT);
} else
ObjResFile = changeFileExt(mProject->options().privateResource, RES_EXT);
}
#endif

// Mention progress in the logs
if (!ObjResFile.isEmpty()) {
Expand All @@ -204,7 +206,9 @@ void ProjectCompiler::writeMakeDefines(QFile &file)
}
writeln(file,"CPP = " + extractFileName(compilerSet()->cppCompiler()));
writeln(file,"CC = " + extractFileName(compilerSet()->CCompiler()));
#ifdef Q_OS_WIN
writeln(file,"WINDRES = " + extractFileName(compilerSet()->resourceCompiler()));
#endif
if (!ObjResFile.isEmpty()) {
writeln(file,"RES = " + genMakePath1(ObjResFile));
writeln(file,"OBJ = " + Objects + " $(RES)");
Expand Down Expand Up @@ -381,6 +385,7 @@ void ProjectCompiler::writeMakeObjFilesRules(QFile &file)
}
}

#ifdef Q_OS_WIN
if (!mProject->options().privateResource.isEmpty()) {

// Concatenate all resource include directories
Expand Down Expand Up @@ -433,6 +438,7 @@ void ProjectCompiler::writeMakeObjFilesRules(QFile &file)
}
writeln(file);
}
#endif
}

void ProjectCompiler::writeln(QFile &file, const QString &s)
Expand Down
4 changes: 3 additions & 1 deletion RedPandaIDE/settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2422,8 +2422,10 @@ static void setDebugOptions(Settings::PCompilerSet pSet) {
}

#ifdef Q_OS_LINUX
pSet->setCustomCompileParams("--sanitize=address");
pSet->setCustomCompileParams("-fsanitize=address");
pSet->setUseCustomCompileParams(true);
pSet->setCustomLinkParams("-fsanitize=address");
pSet->setUseCustomLinkParams(true);
#endif

// pOption = pSet->findOption("-static");
Expand Down
2 changes: 1 addition & 1 deletion packages/deb/builddeb.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

TMP_FOLDER=/tmp/redpandaide
version=0.12.6
version=0.13.2
make install
mkdir $TMP_FOLDER
mkdir $TMP_FOLDER/DEBIAN
Expand Down
2 changes: 1 addition & 1 deletion packages/deb/control
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: RedPanda-IDE
Version: 0.12.6
Version: 0.13.2
Section: devel
Priority: optional
Architecture: amd64
Expand Down
6 changes: 6 additions & 0 deletions packages/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
redpanda-cpp (0.13.2-1) unstable; urgency=medium

* Update to 0.13.2

-- Roy Qu (瞿华) <[email protected]> Thu, 6 Jan 2022 14:52:00 +0800

redpanda-cpp (0.12.6-1) unstable; urgency=medium

* Initial release
Expand Down

0 comments on commit 6209b1f

Please sign in to comment.