objectcreator: linux makefile (CleverRaven#45575)

BjoHart · Nov 24, 2020 · d853602 · d853602
1 parent df54339
commit d853602
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -924,7 +924,7 @@ $(CHKJSON_BIN): $(CHKJSON_SOURCES)
 json-check: $(CHKJSON_BIN)
 	./$(CHKJSON_BIN)
 
-clean: clean-tests
+clean: clean-tests clean-object_creator
 	rm -rf *$(TARGET_NAME) *$(TILES_TARGET_NAME)
 	rm -rf *$(TILES_TARGET_NAME).exe *$(TARGET_NAME).exe *$(TARGET_NAME).a
 	rm -rf *obj *objwin
@@ -1171,6 +1171,12 @@ check: version $(BUILD_PREFIX)cataclysm.a
 clean-tests:
 	$(MAKE) -C tests clean
 
+object_creator: version $(BUILD_PREFIX)cataclysm.a
+	$(MAKE) -C object_creator
+
+clean-object_creator:
+	$(MAKE) -C object_creator clean
+
 validate-pr:
 ifneq ($(CYGWIN),1)
 	@build-scripts/validate_pr_in_jenkins

diff --git a/msvc-full-features/ObjectCreator-vcpkg-static.vcxproj b/msvc-full-features/ObjectCreator-vcpkg-static.vcxproj
@@ -80,7 +80,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <DisableSpecificWarnings>4819;4146;26495;26444;26451;4068</DisableSpecificWarnings>
       <ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
-      <AdditionalOptions>/bigobj /utf-8 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/bigobj /utf-8 /DQT_STATICPLUGIN %(AdditionalOptions)</AdditionalOptions>
       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_CONSOLE;LOCALIZE;USE_VCPKG;QT_NO_KEYWORDS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <LanguageStandard>stdcpp14</LanguageStandard>

diff --git a/object_creator/Makefile b/object_creator/Makefile
@@ -0,0 +1,34 @@
+PKGCONFIG = pkg-config
+QT5_MODULES = Qt5Core Qt5Gui Qt5Widgets
+QT5_LIBS = `$(PKGCONFIG) $(QT5_MODULES) --libs`
+QT5_CFLAGS = `$(PKGCONFIG) $(QT5_MODULES) --cflags`
+
+SOURCES = $(wildcard *.cpp) messages.cpp format.cpp
+VPATH=../src:../tools/format
+OBJS = $(sort $(SOURCES:%.cpp=$(ODIR)/%.o))
+
+CATA_LIB=../$(BUILD_PREFIX)cataclysm.a
+
+ODIR ?= obj
+
+CXXFLAGS += $(QT5_CFLAGS) -I../src -I../tools/format -fPIC
+LDFLAGS += $(QT5_LIBS)
+DEFINES += -DQT_NO_KEYWORDS
+
+object_creator: $(OBJS) $(CATA_LIB)
+	+$(CXX) -o $@ $(OBJS) $(CATA_LIB) $(CXXFLAGS) $(LDFLAGS)
+
+clean:
+	rm -f object_creator
+	rm -rf $(ODIR)
+
+$(shell mkdir -p $(ODIR))
+
+$(ODIR)/%.o: %.cpp
+	$(CXX) $(CPPFLAGS) $(DEFINES) $(CXXFLAGS) -c ../object_creator/$< -o $@
+
+.PHONY: clean object_creator
+
+.SECONDARY: $(OBJS)
+
+-include ${OBJS:.o=.d}
diff --git a/object_creator/creator_main.cpp b/object_creator/creator_main.cpp
@@ -19,9 +19,12 @@
 #include "worldfactory.h"
 
 #include <QtWidgets/qapplication.h>
+#ifdef QT_STATICPLUGIN
 #include <QtCore/QtPlugin>
-
+#ifdef _WIN32
 Q_IMPORT_PLUGIN( QWindowsIntegrationPlugin );
+#endif
+#endif
 
 struct MOD_INFORMATION;
 using mod_id = string_id<MOD_INFORMATION>;

diff --git a/object_creator/fake_spell_listbox.cpp b/object_creator/fake_spell_listbox.cpp
@@ -15,7 +15,6 @@ creator::fake_spell_listbox::fake_spell_listbox( QWidget *parent )
     int row = 0;
     int col = 0;
     int max_row = 0;
-    int max_col = 0;
 
     QListWidget::resize( QSize( default_text_box_width * 2, default_text_box_height * 4 ) );
 

diff --git a/object_creator/fake_spell_listbox.h b/object_creator/fake_spell_listbox.h
@@ -26,7 +26,7 @@ class fake_spell_listbox : public QListWidget
         }
 
         void set_spells( const std::vector<fake_spell> &spells );
-        std::vector<fake_spell> creator::fake_spell_listbox::get_spells() const;
+        std::vector<fake_spell> get_spells() const;
 
         void setText( const QString &str ) {
             id_label.setText( str );

diff --git a/object_creator/fake_spell_window.cpp b/object_creator/fake_spell_window.cpp
@@ -17,7 +17,6 @@ creator::fake_spell_window::fake_spell_window( QWidget *parent, Qt::WindowFlags
     int row = 0;
     int col = 0;
     int max_row = 0;
-    int max_col = 0;
 
     id_label.setParent( this );
     id_label.setText( QString( "id" ) );