Просмотр исходного кода

Updated CamelotEditor with fixed Qt binary plugins

Marko Pintera 13 лет назад
Родитель
Сommit
2fb6cdf494
4 измененных файлов с 24 добавлено и 9 удалено
  1. 4 4
      CamelotEditor/CamelotEditor.vcxproj
  2. 12 1
      CamelotEditor/Source/main.cpp
  3. 8 0
      Dependencies.txt
  4. 0 4
      TODOEditor.txt

+ 4 - 4
CamelotEditor/CamelotEditor.vcxproj

@@ -84,7 +84,7 @@
       <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
     </ClCompile>
     <Link>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
       <AdditionalLibraryDirectories>.\Dependencies\lib\Debug;..\lib\$(Configuration);..\Dependencies\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -101,7 +101,7 @@
       <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
     </ClCompile>
     <Link>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
       <AdditionalLibraryDirectories>.\Dependencies\lib\x64\Debug;..\lib\$(Platform)\$(Configuration);..\Dependencies\lib\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -117,7 +117,7 @@
       <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
     </ClCompile>
     <Link>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
       <AdditionalLibraryDirectories>.\Dependencies\lib\Release;..\lib\$(Configuration);..\Dependencies\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -134,7 +134,7 @@
       <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
     </ClCompile>
     <Link>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
       <AdditionalLibraryDirectories>.\Dependencies\lib\x64\Release;..\lib\$(Platform)\$(Configuration);..\Dependencies\lib\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>

+ 12 - 1
CamelotEditor/Source/main.cpp

@@ -1,11 +1,22 @@
 #include "CmQtEditor.h"
 #include <string>
 #include <QtWidgets/QApplication>
+#include <windows.h>
 
-int main(int argc, char *argv[])
+int CALLBACK WinMain(
+	_In_  HINSTANCE hInstance,
+	_In_  HINSTANCE hPrevInstance,
+	_In_  LPSTR lpCmdLine,
+	_In_  int nCmdShow
+	)
 {
+	int argc = 1;
+	char** argv = new char*[1];
+	argv[0] = "CamelotEditor.exe";
+
 	QApplication a(argc, argv);
 	CamelotEditor w;
 	w.show();
 	return a.exec();
 }
+

+ 8 - 0
Dependencies.txt

@@ -45,6 +45,14 @@ Qt setup instructions:
    - Qt5Core
    - Qt5Gui
    - Qt5Widgets
+ 6. Add Qt platform plugins:
+   - copy qtbase/plugins/platform/ contents from compiled Qt binaries to (CamelotRootDir)/bin/(Platform)/(Configuration)/qtplugins/platform/
+     - this folder contains platform-specific libraries (e.g. qwindows.dll for Windows)
+   - Create conf.qt file in (CamelotRootDir)/bin/(Platform)/(Configuration) containing:
+      [Paths]
+      Plugins = qtplugins
+
+   - This tells Qt where the plugins are located (i.e. in the "plugins" subfolder of the current folder)
 
 Compiling Qt using MSVC2012 compiler:
  - At the moment there are no provided precompiled libraries for 2012 version of MSVC so

+ 0 - 4
TODOEditor.txt

@@ -1,5 +1 @@
-Rename CamelotRenderer to CameotCore(project & solution)
-
-CamelotEditor uses console subsystem
-
 Get rid of the .ui file