rabix
/
RedPanda-CPP
mirror of https://github.com/Reduced-panda/RedPanda-CPP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linux qmake

This commit is contained in:
Roy Qu 2021-12-30 09:04:51 +08:00
parent c4e5eac0f8
commit 2936f688dd
5 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
RedPandaIDE/RedPandaIDE.pro
View File

@ -5,7 +5,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
CONFIG += c++17 CONFIG += c++17
CONFIG += nokey CONFIG += nokey
APP_DIR = RedPandaIDE APP_NAME = RedPandaIDE
gcc { gcc {
QMAKE_CXXFLAGS_RELEASE += -Werror=return-type QMAKE_CXXFLAGS_RELEASE += -Werror=return-type
@ -344,8 +344,8 @@ TRANSLATIONS += \
RedPandaIDE_zh_CN.ts RedPandaIDE_zh_CN.ts
# Default rules for deployment. # Default rules for deployment.
qnx: target.path = /tmp/$${APP_DIR}/bin qnx: target.path = /tmp/$${APP_NAME}/bin
else: unix:!android: target.path = /opt/$${APP_DIR}/bin else: unix:!android: target.path = /opt/$${APP_NAME}/bin
!isEmpty(target.path): INSTALLS += target !isEmpty(target.path): INSTALLS += target
RESOURCES += \ RESOURCES += \

7
RedPandaIDE/settings.cpp
View File

@ -177,16 +177,13 @@ QString Settings::Dirs::appLibDir() const
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
return appDir(); return appDir();
#elif defined(Q_OS_LINUX) #elif defined(Q_OS_LINUX)
if (isGreenEdition()) { return QFileInfo(includeTrailingPathDelimiter(appDir())+"../lib").absolutePath();
return appDir();
}
return includeTrailingPathDelimiter(PREFIX)+"lib";
#endif #endif
} }
QString Settings::Dirs::templateDir() const QString Settings::Dirs::templateDir() const
{ {
return includeTrailingPathDelimiter(appDir()) + "templates"; return includeTrailingPathDelimiter(appLibDir()) + "templates";
} }
QString Settings::Dirs::projectDir() const QString Settings::Dirs::projectDir() const

4
RedPandaIDE/systemconsts.h
View File

@ -19,10 +19,6 @@
#include <QStringList> #include <QStringList>
#ifndef PREFIX
#define PREFIX "/usr/local"
#endif
#define APP_SETTSINGS_FILENAME "redpandacpp.ini" #define APP_SETTSINGS_FILENAME "redpandacpp.ini"
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#define GCC_PROGRAM "gcc.exe" #define GCC_PROGRAM "gcc.exe"

8
Red_Panda_CPP.pro
View File

@ -6,7 +6,9 @@ SUBDIRS += \
APP_NAME = RedPandaIDE APP_NAME = RedPandaIDE
resources.path = /opt/$${APP_NAME} linux: {
resources.files += linux/* resources.path = /opt/$${APP_NAME}
resources.files += linux/*
INSTALLS += resources INSTALLS += resources
}

6
consolepauser/consolepauser.pro
View File

@ -3,7 +3,7 @@ QT -= gui
CONFIG += c++11 console CONFIG += c++11 console
CONFIG -= app_bundle CONFIG -= app_bundle
APP_DIR = RedPandaIDE APP_NAME = RedPandaIDE
# You can make your code fail to compile if it uses deprecated APIs. # You can make your code fail to compile if it uses deprecated APIs.
# In order to do so, uncomment the following line. # In order to do so, uncomment the following line.
@ -25,6 +25,6 @@ CONFIG += lrelease
CONFIG += embed_translations CONFIG += embed_translations
# Default rules for deployment. # Default rules for deployment.
qnx: target.path = /tmp/$${APP_DIR}/bin qnx: target.path = /tmp/$${APP_NAME}/bin
else: unix:!android: target.path = /opt/$${APP_DIR}/bin else: unix:!android: target.path = /opt/$${APP_NAME}/bin
!isEmpty(target.path): INSTALLS += target !isEmpty(target.path): INSTALLS += target