Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 175de7eef87f
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7a735e51a39f
Choose a head ref
  • 3 commits
  • 9 files changed
  • 1 contributor

Commits on Jul 11, 2021

  1. Copy the full SHA
    5ba1d0b View commit details
  2. Stoopid lint.

    pleroy committed Jul 11, 2021
    Copy the full SHA
    928dc5f View commit details
  3. Merge pull request #3060 from pleroy/1.12.1

    Add version numbers to the C++ DLLs
    pleroy authored Jul 11, 2021
    Copy the full SHA
    7a735e5 View commit details
2 changes: 1 addition & 1 deletion base/macros.hpp
Original file line number Diff line number Diff line change
@@ -165,7 +165,7 @@ inline void noreturn() { std::exit(0); }
// Lexicographic comparison (v1, v2, v3) ≥ (w1, w2, w3).
#define VERSION_GE(v1, v2, v3, w1, w2, w3) \
((v1) > (w1) || ((v1) == (w1) && (v2) > (w2)) || \
((v1) == (w1) && (v2) == (w2) && (v3) >= (w3)))
((v1) == (w1) && (v2) == (w2) && (v3) >= (w3)))

#define CLANG_VERSION_GE(major, minor, patchlevel) \
VERSION_GE(__clang_major__, \
110 changes: 110 additions & 0 deletions ksp_plugin/ksp_plugin.rc
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
// Microsoft Visual C++ generated resource script.
//
#include "resource.h"

#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "winres.h"

/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS

/////////////////////////////////////////////////////////////////////////////
// English (United States) resources

#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)

/////////////////////////////////////////////////////////////////////////////
//
// Version
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,0,0,1
PRODUCTVERSION 1,0,0,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x40004L
FILETYPE 0x2L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "080904b0"
BEGIN
VALUE "CompanyName", "Mockingbirdnest"
VALUE "FileDescription", "Principia main DLL"
VALUE "FileVersion", "1.0.0.1"
VALUE "InternalName", "principia.dll"
VALUE "LegalCopyright", "Copyright (C) 2021"
VALUE "OriginalFilename", "principia.dll"
VALUE "ProductName", "Principia mod for KSP (https://github.com/mockingbirdnest/Principia)"
VALUE "ProductVersion", "1.0.0.1"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x809, 1200
END
END

#endif // English (United States) resources
/////////////////////////////////////////////////////////////////////////////


/////////////////////////////////////////////////////////////////////////////
// English (United Kingdom) resources

#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
#pragma code_page(1252)

#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//

1 TEXTINCLUDE
BEGIN
"resource.h\0"
END

2 TEXTINCLUDE
BEGIN
"#include ""winres.h""\r\n"
"\0"
END

3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
END

#endif // APSTUDIO_INVOKED

#endif // English (United Kingdom) resources
/////////////////////////////////////////////////////////////////////////////



#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//


/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

4 changes: 4 additions & 0 deletions ksp_plugin/ksp_plugin.vcxproj
Original file line number Diff line number Diff line change
@@ -58,6 +58,7 @@
<ClInclude Include="plugin.hpp" />
<ClInclude Include="interface.hpp" />
<ClInclude Include="renderer.hpp" />
<ClInclude Include="resource.h" />
<ClInclude Include="vessel.hpp" />
</ItemGroup>
<ItemGroup>
@@ -108,4 +109,7 @@
<ItemGroup>
<Manifest Include="principia.manifest" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="ksp_plugin.rc" />
</ItemGroup>
</Project>
6 changes: 6 additions & 0 deletions ksp_plugin/ksp_plugin.vcxproj.filters
Original file line number Diff line number Diff line change
@@ -74,6 +74,9 @@
<ClInclude Include="orbit_analyser.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="resource.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="interface.cpp">
@@ -191,4 +194,7 @@
<ItemGroup>
<Manifest Include="principia.manifest" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="ksp_plugin.rc" />
</ItemGroup>
</Project>
14 changes: 14 additions & 0 deletions ksp_plugin/resource.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by ksp_plugin.rc

// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 101
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1001
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
14 changes: 14 additions & 0 deletions serialization/resource.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by serialization.rc

// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 101
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1001
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
110 changes: 110 additions & 0 deletions serialization/serialization.rc
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
// Microsoft Visual C++ generated resource script.
//
#include "resource.h"

#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "winres.h"

/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS

/////////////////////////////////////////////////////////////////////////////
// English (United States) resources

#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)

/////////////////////////////////////////////////////////////////////////////
//
// Version
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,0,0,1
PRODUCTVERSION 1,0,0,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x40004L
FILETYPE 0x2L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "080904b0"
BEGIN
VALUE "CompanyName", "Mockingbirdnest"
VALUE "FileDescription", "Principia serialization DLL"
VALUE "FileVersion", "1.0.0.1"
VALUE "InternalName", "serialization.dll"
VALUE "LegalCopyright", "Copyright (C) 2021"
VALUE "OriginalFilename", "serialization.dll"
VALUE "ProductName", "Principia mod for KSP (https://github.com/mockingbirdnest/Principia)"
VALUE "ProductVersion", "1.0.0.1"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x809, 1200
END
END

#endif // English (United States) resources
/////////////////////////////////////////////////////////////////////////////


/////////////////////////////////////////////////////////////////////////////
// English (United Kingdom) resources

#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
#pragma code_page(1252)

#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//

1 TEXTINCLUDE
BEGIN
"resource.h\0"
END

2 TEXTINCLUDE
BEGIN
"#include ""winres.h""\r\n"
"\0"
END

3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
END

#endif // APSTUDIO_INVOKED

#endif // English (United Kingdom) resources
/////////////////////////////////////////////////////////////////////////////



#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//


/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

4 changes: 4 additions & 0 deletions serialization/serialization.vcxproj
Original file line number Diff line number Diff line change
@@ -96,6 +96,7 @@
<ClInclude Include="numerics.pb.h" />
<ClInclude Include="physics.pb.h" />
<ClInclude Include="quantities.pb.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="testing_utilities.pb.h" />
</ItemGroup>
<ItemGroup>
@@ -112,4 +113,7 @@
<ItemGroup>
<Manifest Include="serialization.manifest" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="serialization.rc" />
</ItemGroup>
</Project>
6 changes: 6 additions & 0 deletions serialization/serialization.vcxproj.filters
Original file line number Diff line number Diff line change
@@ -49,6 +49,9 @@
<ClInclude Include="testing_utilities.pb.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="resource.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="geometry.pb.cc">
@@ -82,4 +85,7 @@
<ItemGroup>
<Manifest Include="serialization.manifest" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="serialization.rc" />
</ItemGroup>
</Project>