Made changes to compile and run on Linux with gcc (#228)

Co-authored-by: ousnius <ousnius@users.noreply.github.com>

BodySlide.vcxproj

@@ -769,6 +769,7 @@
     <ClInclude Include="src\utils\ConfigurationManager.h" />
     <ClInclude Include="src\utils\Log.h" />
     <ClInclude Include="src\utils\PlatformUtil.h" />
+    <ClInclude Include="src\utils\StringStuff.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="lib\FSEngine\FSBSA.cpp" />
@@ -830,11 +831,12 @@
     <ClCompile Include="src\utils\ConfigurationManager.cpp" />
     <ClCompile Include="src\utils\Log.cpp" />
     <ClCompile Include="src\utils\PlatformUtil.cpp" />
+    <ClCompile Include="src\utils\StringStuff.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Xml Include="Config.xml" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

BodySlide.vcxproj.filters

@@ -865,6 +865,9 @@
     <ClInclude Include="src\utils\PlatformUtil.h">
       <Filter>Utilities</Filter>
     </ClInclude>
+    <ClInclude Include="src\utils\StringStuff.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
     <ClInclude Include="lib\NIF\Factory.h">
       <Filter>Libraries\NIF</Filter>
     </ClInclude>
@@ -1932,6 +1935,9 @@
     <ClCompile Include="src\utils\PlatformUtil.cpp">
       <Filter>Utilities</Filter>
     </ClCompile>
+    <ClCompile Include="src\utils\StringStuff.cpp">
+      <Filter>Utilities</Filter>
+    </ClCompile>
     <ClCompile Include="lib\NIF\Factory.cpp">
       <Filter>Libraries\NIF</Filter>
     </ClCompile>
@@ -1956,4 +1962,4 @@
       <Filter>Resources</Filter>
     </Xml>
   </ItemGroup>
-</Project>
+</Project>

CMakeLists.txt

@@ -0,0 +1,114 @@
+cmake_minimum_required(VERSION 3.10)
+
+project(BSOS)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED True)
+
+find_package(wxWidgets REQUIRED gl core base net xrc adv qa html propgrid)
+find_package(OpenGL REQUIRED)
+find_package(GLEW REQUIRED)
+set(fbxsdk_dir ../fbxsdk)
+find_library(fbxsdk fbxsdk PATHS ${fbxsdk_dir}/lib/gcc/x64/release)
+
+set(commonsources
+	lib/FSEngine/FSBSA.cpp
+	lib/FSEngine/FSEngine.cpp
+	lib/FSEngine/FSManager.cpp
+	lib/gli/glm/detail/glm.cpp
+	lib/LZ4F/lz4.c
+	lib/LZ4F/lz4frame.c
+	lib/LZ4F/lz4hc.c
+	lib/LZ4F/xxhash.c
+	lib/NIF/Animation.cpp
+	lib/NIF/BasicTypes.cpp
+	lib/NIF/bhk.cpp
+	lib/NIF/ExtraData.cpp
+	lib/NIF/Factory.cpp
+	lib/NIF/Geometry.cpp
+	lib/NIF/NifFile.cpp
+	lib/NIF/Nodes.cpp
+	lib/NIF/Objects.cpp
+	lib/NIF/Particles.cpp
+	lib/NIF/Shaders.cpp
+	lib/NIF/Skin.cpp
+	lib/NIF/utils/Object3d.cpp
+	lib/SOIL2/etc1_utils.c
+	lib/SOIL2/image_DXT.c
+	lib/SOIL2/image_helper.c
+	lib/SOIL2/SOIL2.c
+	lib/TinyXML-2/tinyxml2.cpp
+	src/components/Anim.cpp
+	src/components/Automorph.cpp
+	src/components/DiffData.cpp
+	src/components/Mesh.cpp
+	src/components/NormalGenLayers.cpp
+	src/components/SliderCategories.cpp
+	src/components/SliderData.cpp
+	src/components/SliderGroup.cpp
+	src/components/SliderManager.cpp
+	src/components/SliderPresets.cpp
+	src/components/SliderSet.cpp
+	src/files/MaterialFile.cpp
+	src/files/ObjFile.cpp
+	src/files/ResourceLoader.cpp
+	src/files/TriFile.cpp
+	src/program/GroupManager.cpp
+	src/program/PresetSaveDialog.cpp
+	src/render/GLExtensions.cpp
+	src/render/GLMaterial.cpp
+	src/render/GLOffscreenBuffer.cpp
+	src/render/GLShader.cpp
+	src/render/GLSurface.cpp
+	src/ui/wxStateButton.cpp
+	src/utils/AABBTree.cpp
+	src/utils/ConfigurationManager.cpp
+	src/utils/Log.cpp
+	src/utils/PlatformUtil.cpp
+	src/utils/StringStuff.cpp
+	)
+set(OSsources
+	${commonsources}
+	src/components/RefTemplates.cpp
+	src/components/TweakBrush.cpp
+	src/files/FBXWrangler.cpp
+	src/program/EditUV.cpp
+	src/program/FBXImportDialog.cpp
+	src/program/OutfitProject.cpp
+	src/program/OutfitStudio.cpp
+	src/program/ShapeProperties.cpp
+	)
+set(BSsources
+	${commonsources}
+	src/files/wxDDSImage.cpp
+	src/program/BodySlideApp.cpp
+	src/program/NormalsGenDialog.cpp
+	src/program/PreviewWindow.cpp
+	src/ui/wxNormalsGenDlg.cpp
+	)
+
+add_executable(OutfitStudio ${OSsources})
+add_executable(BodySlide ${BSsources})
+
+include(${wxWidgets_USE_FILE})
+target_include_directories(OutfitStudio SYSTEM PRIVATE
+	${fbxsdk_dir}/include
+	/usr/include/wine/windows
+	)
+target_include_directories(BodySlide SYSTEM PRIVATE
+	/usr/include/wine/windows
+	)
+target_include_directories(OutfitStudio PUBLIC lib/gli)
+target_include_directories(BodySlide PUBLIC lib/gli)
+
+target_link_libraries(OutfitStudio
+	${wxWidgets_LIBRARIES}
+	${OPENGL_LIBRARIES}
+	${GLEW_LIBRARIES}
+	${fbxsdk}
+	xml2)
+
+target_link_libraries(BodySlide
+	${wxWidgets_LIBRARIES}
+	${OPENGL_LIBRARIES}
+	${GLEW_LIBRARIES}
+	xml2)

OutfitStudio.vcxproj

@@ -774,6 +774,7 @@
     <ClInclude Include="src\utils\ConfigurationManager.h" />
     <ClInclude Include="src\utils\Log.h" />
     <ClInclude Include="src\utils\PlatformUtil.h" />
+    <ClInclude Include="src\utils\StringStuff.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="lib\FSEngine\FSBSA.cpp" />
@@ -838,11 +839,12 @@
     <ClCompile Include="src\utils\ConfigurationManager.cpp" />
     <ClCompile Include="src\utils\Log.cpp" />
     <ClCompile Include="src\utils\PlatformUtil.cpp" />
+    <ClCompile Include="src\utils\StringStuff.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Xml Include="Config.xml" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

OutfitStudio.vcxproj.filters

@@ -871,6 +871,9 @@
     <ClInclude Include="src\utils\PlatformUtil.h">
       <Filter>Utilities</Filter>
     </ClInclude>
+    <ClInclude Include="src\utils\StringStuff.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
     <ClInclude Include="lib\NIF\Factory.h">
       <Filter>Libraries\NIF</Filter>
     </ClInclude>
@@ -1950,6 +1953,9 @@
     <ClCompile Include="src\utils\PlatformUtil.cpp">
       <Filter>Utilities</Filter>
     </ClCompile>
+    <ClCompile Include="src\utils\StringStuff.cpp">
+      <Filter>Utilities</Filter>
+    </ClCompile>
     <ClCompile Include="lib\NIF\Factory.cpp">
       <Filter>Libraries\NIF</Filter>
     </ClCompile>
@@ -1980,4 +1986,4 @@
       <Filter>Resources</Filter>
     </Xml>
   </ItemGroup>
-</Project>
+</Project>

Readme-linux.txt

@@ -0,0 +1,45 @@
+Building BodySlide and Outfit Studio on Linux
+
+There's just one file that specifies the build process: CMakeLists.txt.
+
+Install wxWidgets 3.1.3 or newer.  Use the "--enable-stl" option to
+configure.  If you get errors about an ABI mismatch, that means you
+compiled wxWidgets with a different compiler version than BS&OS (and
+wxWidgets is strangely picky about that).  Either gtk2 or gtk3 works.
+With gtk2, you have more background color problems; with gtk3, many
+widgets are distorted because they don't have enough space.  Note that
+many of wxWidget's configure options (such as --enable-universal)
+result in a broken wxWidgets library, so prefer to use as few options
+as possible.
+
+Install FBX SDK.  Put the path to your FBX SDK installation in the
+fbxsdk_dir variable in CMakeLists.txt.
+
+Make sure GLEW is installed.
+
+Then go to your BodySlide-and-Outfit-Studio directory and do:
+mkdir Release
+cd Release
+cmake -DCMAKE_BUILD_TYPE=Release ..
+make
+
+The possible values for CMAKE_BUILD_TYPE:
+	Release
+	RelWithDebInfo
+	Debug
+	MinSizeRel
+	(nothing)
+
+To specify the compiler, set CC and CXX before running cmake.  The build
+directory must be completely empty, or cmake will ignore CC and CXX and
+use the same compilers as it did last time.
+
+Some useful make options:
+make VERBOSE=1
+make -j 4
+
+If you don't want to copy the executables to the BodySlide
+directory within your game, set WX_BODYSLIDE_DATA_DIR and
+WX_OUTFITSTUDIO_DATA_DIR to the BodySlide directory.  Unfortunately,
+program data such as xrc files and icons also come from the data dir;
+if you make changes to the data files, you'll have to copy them over.

lib/NIF/BasicTypes.h

@@ -12,6 +12,7 @@ See the included LICENSE file
 #include <string>
 #include <algorithm>
 #include <memory>
+#include <iostream>
 
 enum NiFileVersion : uint {
 	V2_3 = 0x02030000,
@@ -420,6 +421,9 @@ class BlockRefArray : public RefArray {
 template <typename T>
 class BlockRefShortArray : public BlockRefArray<T> {
 public:
+	typedef BlockRefArray<T> base;
+	using base::arraySize;
+	using base::refs;
 	virtual void Get(NiStream& stream) override {
 		stream.read((char*)&arraySize, 2);
 		refs.resize(arraySize);
@@ -429,15 +433,15 @@ class BlockRefShortArray : public BlockRefArray<T> {
 	}
 
 	virtual void Put(NiStream& stream) override {
-		CleanInvalidRefs();
+		base::CleanInvalidRefs();
 		stream.write((char*)&arraySize, 2);
 
 		for (auto &r : refs)
 			r.Put(stream);
 	}
 
 	virtual void Put(NiStream& stream, const int forcedSize) override {
-		CleanInvalidRefs();
+		base::CleanInvalidRefs();
 		arraySize = forcedSize;
 		refs.resize(forcedSize);
 

lib/NIF/Keys.h

@@ -59,6 +59,8 @@ class KeyGroup {
 				case TBC_KEY:
 					stream >> key.tbc;
 					break;
+				default:
+					break;
 				}
 
 				keys[i] = std::move(key);
@@ -84,6 +86,8 @@ class KeyGroup {
 				case TBC_KEY:
 					stream << keys[i].tbc;
 					break;
+				default:
+					break;
 				}
 			}
 		}

lib/NIF/NifFile.h

@@ -69,6 +69,7 @@ class NifFile {
 
 	NifFile& operator=(const NifFile& other) {
 		CopyFrom(other);
+		return *this;
 	}
 
 	NiHeader& GetHeader() { return hdr; }

lib/NIF/VertexData.h

@@ -81,7 +81,7 @@ class VertexDesc {
 	// Set offset to a specific vertex attribute in the description
 	void SetAttributeOffset(VertexAttribute attr, uint offset) {
 		if (attr != VA_POSITION) {
-			desc = ((uint64_t)offset << (4 * (byte)attr + 2)) | desc & ~(15 << (4 * (byte)attr + 4));
+			desc = ((uint64_t)offset << (4 * (byte)attr + 2)) | (desc & ~(15 << (4 * (byte)attr + 4)));
 		}
 	}
 

lib/NIF/bhk.cpp

@@ -51,6 +51,8 @@ void BoundingVolume::Get(NiStream& stream) {
 	case HALFSPACE_BV:
 		stream >> bvHalfSpace;
 		break;
+	default:
+		break;
 	}
 }
 
@@ -73,6 +75,8 @@ void BoundingVolume::Put(NiStream& stream) {
 	case HALFSPACE_BV:
 		stream << bvHalfSpace;
 		break;
+	default:
+		break;
 	}
 }
 

lib/NIF/bhk.h

@@ -127,6 +127,8 @@ struct MotorDesc {
 		case MOTOR_SPRING:
 			motorSpringDamper.Get(stream);
 			break;
+		default:
+			break;
 		}
 	}
 
@@ -143,6 +145,8 @@ struct MotorDesc {
 		case MOTOR_SPRING:
 			motorSpringDamper.Put(stream);
 			break;
+		default:
+			break;
 		}
 	}
 };