[nostalgia/studio] Get building in MSVC
This commit is contained in:
parent
e927c51b61
commit
1ec8d721f1
@ -18,6 +18,7 @@ endif()
|
||||
|
||||
|
||||
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
|
||||
include(GenerateExportHeader)
|
||||
include(address_sanitizer)
|
||||
|
||||
set(NOSTALGIA_CONAN_PATHS ${CMAKE_SOURCE_DIR}/conanbuild/conan_paths.cmake)
|
||||
|
@ -67,7 +67,7 @@ class UpdatePixelsCommand: public QUndoCommand {
|
||||
return item < o.item;
|
||||
}
|
||||
|
||||
operator auto() const {
|
||||
operator quint64() const {
|
||||
return reinterpret_cast<quint64>(item.data());
|
||||
}
|
||||
};
|
||||
|
@ -14,6 +14,9 @@ add_library(
|
||||
install(TARGETS NostalgiaStudio
|
||||
LIBRARY DESTINATION ${NOSTALGIA_DIST_LIB}/nostalgia)
|
||||
|
||||
generate_export_header(NostalgiaStudio)
|
||||
target_include_directories(NostalgiaStudio PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
|
||||
|
||||
target_link_libraries(
|
||||
NostalgiaStudio PUBLIC
|
||||
Qt5::Widgets
|
||||
@ -31,6 +34,7 @@ install(
|
||||
wizard.hpp
|
||||
plugin.hpp
|
||||
project.hpp
|
||||
${PROJECT_BINARY_DIR}/nostalgiastudio_export.h
|
||||
DESTINATION
|
||||
include/nostalgia/studio/lib
|
||||
)
|
||||
|
@ -11,9 +11,11 @@
|
||||
#include <QUndoStack>
|
||||
#include <QWidget>
|
||||
|
||||
#include "nostalgiastudio_export.h"
|
||||
|
||||
namespace nostalgia::studio {
|
||||
|
||||
class Editor: public QWidget {
|
||||
class NOSTALGIASTUDIO_EXPORT Editor: public QWidget {
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
|
@ -15,9 +15,11 @@
|
||||
#include <ox/fs/fs.hpp>
|
||||
#include <ox/mc/mc.hpp>
|
||||
|
||||
#include "nostalgiastudio_export.h"
|
||||
|
||||
namespace nostalgia::studio {
|
||||
|
||||
class Project: public QObject {
|
||||
class NOSTALGIASTUDIO_EXPORT Project: public QObject {
|
||||
Q_OBJECT
|
||||
|
||||
private:
|
||||
|
@ -55,7 +55,7 @@ bool WizardSelect::isComplete() const {
|
||||
|
||||
void WizardSelect::itemSelected(int row) {
|
||||
auto w = dynamic_cast<Wizard*>(wizard());
|
||||
if (w and row > -1) {
|
||||
if (w && row > -1) {
|
||||
// remove other pages
|
||||
while (nextId() > -1) {
|
||||
w->removePage(nextId());
|
||||
|
@ -21,15 +21,17 @@
|
||||
#include <QVector>
|
||||
#include <QWizard>
|
||||
|
||||
#include "nostalgiastudio_export.h"
|
||||
|
||||
namespace nostalgia::studio {
|
||||
|
||||
struct WizardMaker {
|
||||
struct NOSTALGIASTUDIO_EXPORT WizardMaker {
|
||||
QString name;
|
||||
std::function<QVector<QWizardPage*>()> make;
|
||||
std::function<int(QWizard*)> onAccept = [](QWizard*) { return 0; };
|
||||
};
|
||||
|
||||
class WizardSelect: public QWizardPage {
|
||||
class NOSTALGIASTUDIO_EXPORT WizardSelect: public QWizardPage {
|
||||
Q_OBJECT
|
||||
|
||||
private:
|
||||
@ -56,7 +58,7 @@ class WizardSelect: public QWizardPage {
|
||||
};
|
||||
|
||||
|
||||
class WizardFormPage: public QWizardPage {
|
||||
class NOSTALGIASTUDIO_EXPORT WizardFormPage: public QWizardPage {
|
||||
Q_OBJECT
|
||||
|
||||
private:
|
||||
@ -103,7 +105,7 @@ class WizardFormPage: public QWizardPage {
|
||||
};
|
||||
|
||||
|
||||
class WizardConclusionPage: public QWizardPage {
|
||||
class NOSTALGIASTUDIO_EXPORT WizardConclusionPage: public QWizardPage {
|
||||
Q_OBJECT
|
||||
private:
|
||||
QString m_baseMsg = "";
|
||||
@ -119,7 +121,7 @@ class WizardConclusionPage: public QWizardPage {
|
||||
};
|
||||
|
||||
|
||||
class Wizard: public QWizard {
|
||||
class NOSTALGIASTUDIO_EXPORT Wizard: public QWizard {
|
||||
Q_OBJECT
|
||||
private:
|
||||
std::function<int(QWizard*)> m_acceptFunc;
|
||||
|
Loading…
Reference in New Issue
Block a user