Delete ida 9.0 beta 2 hacks

CMakeLists.txt

@@ -70,8 +70,8 @@ set(src
     "OpenLumina/OpenLumina.h"
 )
 
-if (IDA_90_BETA3)
-    message(STATUS "Compiling for IDA 9.0 Beta 3")
+if (IDA_90_STABLE)
+    message(STATUS "Compiling for IDA 9.0")
     add_ida_plugin(OpenLumina NOEA32 ${PROJECT_SOURCE_DIR}/OpenLumina/OpenLumina.cpp)
 else()
     add_ida_plugin(OpenLumina ${PROJECT_SOURCE_DIR}/OpenLumina/OpenLumina.cpp)
@@ -85,12 +85,6 @@ ida_target_include_directories(OpenLumina PRIVATE ${IdaSdk_INCLUDE_DIRS})
 
 add_ida_library(OpenLuminaLib ${src})
 
-if (IDA_90_BETA2)
-    message(STATUS "Compiling for IDA 9.0 Beta 2")
-    target_compile_definitions(OpenLuminaLib_ea32 PUBLIC IDA_90_BETA2=1)
-    target_compile_definitions(OpenLuminaLib_ea64 PUBLIC IDA_90_BETA2=1)
-endif()
-
 if (WIN32)
     ida_target_link_libraries(OpenLumina crypt32.lib)
 endif()

CMakeSettings.json

@@ -7,7 +7,7 @@
       "inheritEnvironments": [ "msvc_x64_x64" ],
       "buildRoot": "${projectDir}\\out\\build\\${name}",
       "installRoot": "${projectDir}\\out\\install\\${name}",
-      "cmakeCommandArgs": "-DIdaSdk_ROOT_DIR=e:/ida90/idasdk90b3/",
+      "cmakeCommandArgs": "-DIdaSdk_ROOT_DIR=e:/ida90/idasdk90/",
       "buildCommandArgs": "",
       "ctestCommandArgs": ""
     },
@@ -18,7 +18,7 @@
       "inheritEnvironments": [ "msvc_x64_x64" ],
       "buildRoot": "${projectDir}\\out\\build\\${name}",
       "installRoot": "${projectDir}\\out\\install\\${name}",
-      "cmakeCommandArgs": "-DIdaSdk_ROOT_DIR=e:/ida90/idasdk90b3/",
+      "cmakeCommandArgs": "-DIdaSdk_ROOT_DIR=e:/ida90/idasdk90/",
       "buildCommandArgs": "",
       "ctestCommandArgs": ""
     }

OpenLumina/OpenLumina.h

@@ -29,7 +29,7 @@ struct openssl_ctx
 
 #endif
 
-#if __EA64__ && (IDA_90_BETA2 || IDA_SDK_VERSION < 900)
+#if __EA64__ && IDA_SDK_VERSION < 900
 #define IDA_LIB_SUFF "64"
 #else
 #define IDA_LIB_SUFF

OpenLumina/PropertySheet.props

@@ -3,7 +3,7 @@
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros">
     <IDADIR>..\$(Platform)\$(Configuration)</IDADIR>
-    <IDASDK>e:\ida90\idasdk90b3</IDASDK>
+    <IDASDK>e:\ida90\idasdk90</IDASDK>
   </PropertyGroup>
   <PropertyGroup />
   <ItemDefinitionGroup />

build_win_90b2.cmd → build_win_90.cmd

@@ -1,5 +1,5 @@
 @echo off
 rmdir /S /Q out
-cmake -DCMAKE_BUILD_TYPE=Release -DIdaSdk_ROOT_DIR=e:\ida90\idasdk90b2 -DIDA_90_BETA2=1 -B out
+cmake -DCMAKE_BUILD_TYPE=Release -DIdaSdk_ROOT_DIR=e:\ida90\idasdk90 -DIDA_90_STABLE=1 -B out
 cmake --build out --config Release
 rem cp out/OpenLumina64.so /home/tom_rus/idafree-8.4/plugins/