Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to VS2019 and Win10 SDK #26

Merged
merged 3 commits into from
Oct 22, 2020
Merged

Update to VS2019 and Win10 SDK #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d9f07d
Update to VS2019 and Win10 SDK
x87 Oct 19, 2020
2fb07f1
Bump version to 4.4
x87 Oct 22, 2020
cb27740
Update rc file
x87 Oct 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,5 @@ output/
*.sbr
Debug/*
Release/*
ipch/
ipch/
.vs/
3 changes: 0 additions & 3 deletions .vs/ProjectSettings.json
View file
Open in desktop

This file was deleted.

Binary file removed .vs/slnx.sqlite
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions CLEO Changes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
CLEO 4
--------------------
Change Log
-- 4.4.0 --
* Dropped Windows XP support

-- 4.3.24 --
* Added the export of some functions required for new version of the CLEO+ plugin, and can be used in other plugins: CLEO_GetScriptTextureById, CLEO_GetInternalAudioStream, CLEO_CreateCustomScript, CLEO_GetLastCreatedCustomScript, CLEO_AddScriptDeleteDelegate, CLEO_RemoveScriptDeleteDelegate.
Expand Down
9 changes: 4 additions & 5 deletions CLEO4.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,21 +65,21 @@
<IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename>
<Keyword>Win32Proj</Keyword>
<RootNamespace>CLEO4</RootNamespace>
<WindowsTargetPlatformVersion>7.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release GTASA|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v141_xp</PlatformToolset>
thelink2012 marked this conversation as resolved.
Show resolved Hide resolved
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug GTASA|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v141_xp</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand All @@ -96,7 +96,6 @@
<IntDir>$(SolutionDir)output\.obj\Release\</IntDir>
<TargetName>CLEO</TargetName>
<TargetExt>.asi</TargetExt>
<IncludePath>$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);E:\Documents\Para GTA\plugin-sdk-master\shared</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug GTASA|Win32'">
<OutDir>$(SolutionDir)output\Debug\</OutDir>
Expand All @@ -113,7 +112,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<AdditionalIncludeDirectories>$(PLUGIN_SDK_DIR)\plugin_sa\;$(PLUGIN_SDK_DIR)\plugin_sa\game_sa\;$(SolutionDir)\third-party\bass;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(PLUGIN_SDK_DIR)\plugin_sa\;$(PLUGIN_SDK_DIR)\plugin_sa\game_sa\;$(PLUGIN_SDK_DIR)\shared\;$(PLUGIN_SDK_DIR)\shared\game\;$(SolutionDir)\third-party\bass;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_NDEBUG;_USING_V110_SDK71_;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS;GTASA;GTAGAME_NAME="San Andreas";GTAGAME_ABBR="SA";GTAGAME_ABBRLOW="sa";GTAGAME_PROTAGONISTNAME="CJ";GTAGAME_CITYNAME="San Andreas";CLEO4_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
<PrecompiledHeader>Create</PrecompiledHeader>
Expand Down
4 changes: 2 additions & 2 deletions cleo_sdk/CLEO.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

#include <wtypes.h>

#define CLEO_VERSION 0x04032400
#define CLEO_VERSIONTEXT "4.3.24"
#define CLEO_VERSION 0x04040000
#define CLEO_VERSIONTEXT "4.4.0"

//result of CLEO_GetGameVersion()
#define GV_US10 0 //1.0 us
Expand Down
Binary file modified cleo_sdk/CLEO.lib
View file
Open in desktop
Binary file not shown.
Binary file modified source/CLEO4.rc
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion source/stdafx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <game_sa/CPools.h>
#include <game_sa/CMenuManager.h>
#include <game_sa/CText.h>
#include <game_sa/CRGBA.h>
#include <game/CRGBA.h>
thelink2012 marked this conversation as resolved.
Show resolved Hide resolved
#include <game_sa/cHandlingDataMgr.h>
#include <game_sa/CPlayerPed.h>
#include <game_sa/CRadar.h>
Expand Down