Revert "32bit stuff"

This reverts commit 48dd38e.
Battlerax · Jul 30, 2018 · 53191d9 · 53191d9
1 parent 48dd38e
commit 53191d9
Show file tree

Hide file tree

Showing 25 changed files with 420 additions and 5,521 deletions.
diff --git a/RagePawn.sln b/RagePawn.sln
@@ -7,12 +7,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RagePawn", "RagePawn\RagePa
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amxlib", "amxlib\amxlib.vcxproj", "{493F24E8-E48E-4250-8593-B12EE316AA78}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amxTester", "amxTester\amxTester.vcxproj", "{B59AA6E6-DC2D-4850-B947-33566309C7C0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win32console", "win32console\win32console.vcxproj", "{5BC05F39-9D1F-4FD6-A19B-7DDDB2160719}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amx32", "amx32\amx32.vcxproj", "{44E4548C-4A08-4163-B465-812BEAAF1FD8}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -23,44 +17,20 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{F66E3CAC-649E-424E-A9B3-24C77589DCF9}.Debug|x64.ActiveCfg = Debug|x64
 		{F66E3CAC-649E-424E-A9B3-24C77589DCF9}.Debug|x64.Build.0 = Debug|x64
-		{F66E3CAC-649E-424E-A9B3-24C77589DCF9}.Debug|x86.ActiveCfg = Debug|x64
-		{F66E3CAC-649E-424E-A9B3-24C77589DCF9}.Debug|x86.Build.0 = Debug|x64
+		{F66E3CAC-649E-424E-A9B3-24C77589DCF9}.Debug|x86.ActiveCfg = Debug|Win32
+		{F66E3CAC-649E-424E-A9B3-24C77589DCF9}.Debug|x86.Build.0 = Debug|Win32
 		{F66E3CAC-649E-424E-A9B3-24C77589DCF9}.Release|x64.ActiveCfg = Release|x64
 		{F66E3CAC-649E-424E-A9B3-24C77589DCF9}.Release|x64.Build.0 = Release|x64
 		{F66E3CAC-649E-424E-A9B3-24C77589DCF9}.Release|x86.ActiveCfg = Release|Win32
 		{F66E3CAC-649E-424E-A9B3-24C77589DCF9}.Release|x86.Build.0 = Release|Win32
 		{493F24E8-E48E-4250-8593-B12EE316AA78}.Debug|x64.ActiveCfg = Debug|x64
 		{493F24E8-E48E-4250-8593-B12EE316AA78}.Debug|x64.Build.0 = Debug|x64
-		{493F24E8-E48E-4250-8593-B12EE316AA78}.Debug|x86.ActiveCfg = Debug|x64
-		{493F24E8-E48E-4250-8593-B12EE316AA78}.Debug|x86.Build.0 = Debug|x64
+		{493F24E8-E48E-4250-8593-B12EE316AA78}.Debug|x86.ActiveCfg = Debug|Win32
+		{493F24E8-E48E-4250-8593-B12EE316AA78}.Debug|x86.Build.0 = Debug|Win32
 		{493F24E8-E48E-4250-8593-B12EE316AA78}.Release|x64.ActiveCfg = Release|x64
 		{493F24E8-E48E-4250-8593-B12EE316AA78}.Release|x64.Build.0 = Release|x64
 		{493F24E8-E48E-4250-8593-B12EE316AA78}.Release|x86.ActiveCfg = Release|Win32
 		{493F24E8-E48E-4250-8593-B12EE316AA78}.Release|x86.Build.0 = Release|Win32
-		{B59AA6E6-DC2D-4850-B947-33566309C7C0}.Debug|x64.ActiveCfg = Debug|x64
-		{B59AA6E6-DC2D-4850-B947-33566309C7C0}.Debug|x64.Build.0 = Debug|x64
-		{B59AA6E6-DC2D-4850-B947-33566309C7C0}.Debug|x86.ActiveCfg = Debug|x64
-		{B59AA6E6-DC2D-4850-B947-33566309C7C0}.Debug|x86.Build.0 = Debug|x64
-		{B59AA6E6-DC2D-4850-B947-33566309C7C0}.Release|x64.ActiveCfg = Release|x64
-		{B59AA6E6-DC2D-4850-B947-33566309C7C0}.Release|x64.Build.0 = Release|x64
-		{B59AA6E6-DC2D-4850-B947-33566309C7C0}.Release|x86.ActiveCfg = Release|Win32
-		{B59AA6E6-DC2D-4850-B947-33566309C7C0}.Release|x86.Build.0 = Release|Win32
-		{5BC05F39-9D1F-4FD6-A19B-7DDDB2160719}.Debug|x64.ActiveCfg = Debug|x64
-		{5BC05F39-9D1F-4FD6-A19B-7DDDB2160719}.Debug|x64.Build.0 = Debug|x64
-		{5BC05F39-9D1F-4FD6-A19B-7DDDB2160719}.Debug|x86.ActiveCfg = Debug|Win32
-		{5BC05F39-9D1F-4FD6-A19B-7DDDB2160719}.Debug|x86.Build.0 = Debug|Win32
-		{5BC05F39-9D1F-4FD6-A19B-7DDDB2160719}.Release|x64.ActiveCfg = Release|Win32
-		{5BC05F39-9D1F-4FD6-A19B-7DDDB2160719}.Release|x64.Build.0 = Release|Win32
-		{5BC05F39-9D1F-4FD6-A19B-7DDDB2160719}.Release|x86.ActiveCfg = Release|Win32
-		{5BC05F39-9D1F-4FD6-A19B-7DDDB2160719}.Release|x86.Build.0 = Release|Win32
-		{44E4548C-4A08-4163-B465-812BEAAF1FD8}.Debug|x64.ActiveCfg = Debug|x64
-		{44E4548C-4A08-4163-B465-812BEAAF1FD8}.Debug|x64.Build.0 = Debug|x64
-		{44E4548C-4A08-4163-B465-812BEAAF1FD8}.Debug|x86.ActiveCfg = Debug|Win32
-		{44E4548C-4A08-4163-B465-812BEAAF1FD8}.Debug|x86.Build.0 = Debug|Win32
-		{44E4548C-4A08-4163-B465-812BEAAF1FD8}.Release|x64.ActiveCfg = Release|Win32
-		{44E4548C-4A08-4163-B465-812BEAAF1FD8}.Release|x64.Build.0 = Release|Win32
-		{44E4548C-4A08-4163-B465-812BEAAF1FD8}.Release|x86.ActiveCfg = Release|Win32
-		{44E4548C-4A08-4163-B465-812BEAAF1FD8}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/RagePawn/RagePawn.vcxproj b/RagePawn/RagePawn.vcxproj
@@ -107,7 +107,6 @@
       <PreprocessorDefinitions>_DEBUG;RAGEPAWN_EXPORTS;_CRT_SECURE_NO_WARNINGS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <AdditionalIncludeDirectories>D:\ragemp-cppsdk;D:\pawn\amx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <CallingConvention>Cdecl</CallingConvention>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -136,12 +135,12 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>false</SDLCheck>
+      <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;RAGEPAWN_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
     </ClCompile>

diff --git a/RagePawn/pawn.cpp b/RagePawn/pawn.cpp
@@ -1,5 +1,6 @@
 #include "pawn.hpp"
-
+#include "../amxlib/amx.h"
+#include "../amxlib/amxaux.h"
 
 namespace fs = std::experimental::filesystem;
 
@@ -43,7 +44,7 @@ static cell AMX_NATIVE_CALL n_print_int(AMX *amx, const cell *params)
 const AMX_NATIVE_INFO print_Natives[] =
 {
 	{ "print_int", n_print_int },
-	{ NULL, NULL }
+	{ NULL,NULL }
 };
 
 int Pawn::RunAMX(const std::string& path)
@@ -52,6 +53,10 @@ int Pawn::RunAMX(const std::string& path)
 	cell ret = 0;
 	int num = 0;
 
+	// LoadProgram
+	size_t memsize = aux_ProgramSize((char*)path_str);
+	//void * program = malloc(memsize);
+
 	err = aux_LoadProgram(&amx, (char*)path_str, NULL);
 	if (err != AMX_ERR_NONE) return Terminate();
 
@@ -63,7 +68,6 @@ int Pawn::RunAMX(const std::string& path)
 	std::cout << "Registered natives: " << num << std::endl;
 
 	// ExecProgram
-	Sleep(2500);
 	err = amx_Exec(&amx, &ret, AMX_EXEC_MAIN);
 	if (err != AMX_ERR_NONE) return Terminate();
 

diff --git a/RagePawn/pawn.hpp b/RagePawn/pawn.hpp
@@ -2,9 +2,7 @@
 
 #include "main.hpp"
 #include <filesystem>
-
 #include "../amxlib/amx.h"
-#include "../amxlib/amxaux.h"
 
 namespace gm
 {