- enhancement: add raylib.h to autolink
- fix: shouldn't generate default autolink settings in linux
This commit is contained in:
parent
b9b7ff38c0
commit
3b0c8eccdb
2
NEWS.md
2
NEWS.md
|
@ -1,6 +1,8 @@
|
||||||
Red Panda C++ Version 0.12.7
|
Red Panda C++ Version 0.12.7
|
||||||
- change: make current build system follow FHS specifications
|
- change: make current build system follow FHS specifications
|
||||||
- fix: crash when close settings dialog in Ubuntu 20.04 (but we'll leak memory now...)
|
- fix: crash when close settings dialog in Ubuntu 20.04 (but we'll leak memory now...)
|
||||||
|
- enhancement: add raylib.h to autolink
|
||||||
|
- fix: shouldn't generate default autolink settings in linux
|
||||||
|
|
||||||
Red Panda C++ Version 0.12.6
|
Red Panda C++ Version 0.12.6
|
||||||
- fix: heartbeat for gdb server async command shouldn't disable actions
|
- fix: heartbeat for gdb server async command shouldn't disable actions
|
||||||
|
|
|
@ -41,6 +41,7 @@ void AutolinkManager::load()
|
||||||
QString filename=dir.filePath(DEV_AUTOLINK_FILE);
|
QString filename=dir.filePath(DEV_AUTOLINK_FILE);
|
||||||
QFile file(filename);
|
QFile file(filename);
|
||||||
if (!file.exists()) {
|
if (!file.exists()) {
|
||||||
|
#ifdef Q_OS_WIN
|
||||||
QFile preFile(":/config/autolink.json");
|
QFile preFile(":/config/autolink.json");
|
||||||
if (!preFile.open(QFile::ReadOnly)) {
|
if (!preFile.open(QFile::ReadOnly)) {
|
||||||
throw FileError(QObject::tr("Can't open file '%1' for read.")
|
throw FileError(QObject::tr("Can't open file '%1' for read.")
|
||||||
|
@ -54,6 +55,9 @@ void AutolinkManager::load()
|
||||||
file.write(content);
|
file.write(content);
|
||||||
file.close();
|
file.close();
|
||||||
preFile.close();
|
preFile.close();
|
||||||
|
#else
|
||||||
|
return;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
if (file.open(QFile::ReadOnly)) {
|
if (file.open(QFile::ReadOnly)) {
|
||||||
QByteArray content = file.readAll();
|
QByteArray content = file.readAll();
|
||||||
|
|
|
@ -1,33 +1,38 @@
|
||||||
[{
|
[
|
||||||
"header": "ege.h",
|
{
|
||||||
"links": "-lgraphics -luuid -lmsimg32 -lgdi32 -limm32 -lole32 -loleaut32 -lwinmm -lgdiplus"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"header": "GL/gl.h",
|
|
||||||
"links": "-lopengl32"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"header": "GL/glu.h",
|
|
||||||
"links": "-lglu32 -lopengl32"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"header": "GL/freeglut.h",
|
"header": "GL/freeglut.h",
|
||||||
"links": "-lfreeglut -lwinmm"
|
"links": "-lfreeglut -lwinmm"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"header": "GL/glut.h",
|
"header": "GL/gl.h",
|
||||||
"links": "-lfreeglut -lwinmm"
|
"links": "-lopengl32"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"header": "GL/glew.h",
|
"header": "GL/glew.h",
|
||||||
"links": "-lglew32 -lopengl32"
|
"links": "-lglew32 -lopengl32"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
"header": "GL/glu.h",
|
||||||
|
"links": "-lglu32 -lopengl32"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"header": "GL/glut.h",
|
||||||
|
"links": "-lfreeglut -lwinmm"
|
||||||
|
},
|
||||||
|
{
|
||||||
"header": "GLFW/glfw3.h",
|
"header": "GLFW/glfw3.h",
|
||||||
"links": "-lglfw3 -lgdi32"
|
"links": "-lglfw3 -lgdi32"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
"header": "ege.h",
|
||||||
|
"links": "-lgraphics -luuid -lmsimg32 -lgdi32 -limm32 -lole32 -loleaut32 -lwinmm -lgdiplus"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"header": "raylib.h",
|
||||||
|
"links": "-lraylib -lglfw3 -lopengl32 -lgdi32 -lopenal -lwinmm"
|
||||||
|
},
|
||||||
|
{
|
||||||
"header": "turtle.h",
|
"header": "turtle.h",
|
||||||
"links": "-lturtle"
|
"links": "-lturtle"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
Loading…
Reference in New Issue