Skip to content

Commit

Permalink
Update armips with regex workaround
Browse files Browse the repository at this point in the history
  • Loading branch information
@hrydgard
hrydgard committed Mar 15, 2017
1 parent e17772b commit a4699a3
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 5 deletions.
5 changes: 3 additions & 2 deletions CMakeLists.txt
View file
Expand Up @@ -356,6 +356,9 @@ add_library(Common STATIC
Common/ThreadSafeList.h
Common/Timer.cpp
Common/Timer.h)

add_subdirectory(ext)

include_directories(Common)
setup_target_project(Common Common)

Expand All @@ -374,8 +377,6 @@ if(USING_GLES2)
find_package(X11)
endif()

add_subdirectory(ext)

add_library(vjson STATIC
ext/native/ext/vjson/json.cpp
ext/native/ext/vjson/json.h
Expand Down
2 changes: 2 additions & 0 deletions Common/stdafx.h
View file
Expand Up @@ -17,6 +17,7 @@

#pragma once

#ifdef _WIN32
#ifndef _WIN32_WINNT

#if _MSC_VER < 1700
Expand All @@ -36,3 +37,4 @@
#include "CommonWindows.h"
#include <tchar.h>
#include <vector>
#endif
5 changes: 4 additions & 1 deletion ext/CMakeLists.txt
View file
@@ -1,9 +1,12 @@
add_subdirectory(cmake/armips)
set(ARMIPS_REGEXP OFF CACHE BOOL "" FORCE)

add_subdirectory(armips)
if(NOT USING_GLES2)
add_subdirectory(glew)
endif()

set(ENABLE_GLSLANG_BINARIES OFF CACHE BOOL "let's not build binaries we don't need" FORCE)

add_subdirectory(glslang)
add_subdirectory(snappy)
add_subdirectory(udis86)
Expand Down
2 changes: 1 addition & 1 deletion ext/armips
Submodule armips updated 52 files
+6 −4 Archs/ARM/ArmParser.cpp
+14 −8 Archs/ARM/CThumbInstruction.cpp
+4 −1 Archs/ARM/ThumbOpcodes.cpp
+46 −8 Archs/MIPS/CMipsInstruction.cpp
+42 −5 Archs/MIPS/CMipsInstruction.h
+2 −1 Archs/MIPS/Mips.cpp
+5 −2 Archs/MIPS/Mips.h
+14 −4 Archs/MIPS/MipsElfFile.cpp
+6 −5 Archs/MIPS/MipsElfFile.h
+132 −35 Archs/MIPS/MipsMacros.cpp
+12 −5 Archs/MIPS/MipsMacros.h
+501 −190 Archs/MIPS/MipsOpcodes.cpp
+28 −10 Archs/MIPS/MipsOpcodes.h
+287 −50 Archs/MIPS/MipsParser.cpp
+9 −1 Archs/MIPS/MipsParser.h
+95 −58 CMakeLists.txt
+52 −4 Commands/CDirectiveData.cpp
+5 −3 Commands/CDirectiveData.h
+39 −26 Commands/CDirectiveFile.cpp
+19 −17 Commands/CDirectiveFile.h
+1 −1 Core/Assembler.h
+6 −4 Core/Common.cpp
+111 −19 Core/ELF/ElfFile.cpp
+8 −3 Core/ELF/ElfFile.h
+29 −22 Core/ELF/ElfRelocator.cpp
+2 −1 Core/ELF/ElfRelocator.h
+147 −0 Core/ExpressionFunctions.cpp
+40 −18 Core/FileManager.cpp
+25 −20 Core/FileManager.h
+2 −2 Core/Misc.cpp
+3 −0 Core/SymbolData.cpp
+1 −1 Core/SymbolData.h
+1 −0 Main/Tests.cpp
+1 −1 Main/Tests.h
+100 −76 Main/main.cpp
+78 −66 Parser/DirectivesParser.cpp
+15 −5 Parser/DirectivesParser.h
+48 −20 Parser/Parser.cpp
+62 −36 Parser/Tokenizer.cpp
+2 −1 Parser/Tokenizer.h
+904 −0 Readme.md
+21 −6 Tests/Core/ExpressionFunctions/ExpressionFunctions.asm
+28 −16 Tests/Core/ExpressionFunctions/expected.txt
+ − Tests/MIPS/PS2 Opcodes/expected.bin
+109 −0 Tests/RSP Opcodes/RSP Opcodes.asm
+ − Tests/RSP Opcodes/expected.bin
+16 −1 Util/ByteArray.h
+1 −1 Util/FileClasses.cpp
+12 −5 Util/Util.cpp
+1 −0 Util/Util.h
+6 −0 armips.vcxproj
+1 −8 stdafx.h
9 changes: 8 additions & 1 deletion ext/cmake/armips/CMakeLists.txt
View file
@@ -1,12 +1,19 @@
cmake_minimum_required(VERSION 2.8)
project(armips)

option(ARMIPS_REGEXP "Enable regexp expression functions" ON)

if(NOT WIN32)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -std=c++11")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
endif()

set(ARMIPS_PATH ../../armips)

if(ARMIPS_REGEXP)
add_definitions(-DARMIPS_REGEXP=1)
endif()

include_directories(${ARMIPS_PATH})

add_library(armips
${ARMIPS_PATH}/Util/ByteArray.cpp
Expand Down

1 comment on commit a4699a3

@hrydgard
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Darn, the new armips doesn't build on some linux platforms... I'll fix.

Please sign in to comment.