Use right macro to build for emulator

the build system export the emulator info by simulator macro

Change-Id: I534f1be557b19d75cce5d4558ec9347e4ac5575a

diff --git a/packaging/wifi-direct-manager.spec b/packaging/wifi-direct-manager.spec
index de8f6ff..3a60a97 100755 (executable)
--- a/packaging/wifi-direct-manager.spec
+++ b/packaging/wifi-direct-manager.spec
@@ -29,15 +29,21 @@ wifi drect plugin for wpa supplicant
 %prep
 %setup -q
 
+%build
+
 %ifarch %{arm}
 export ARCH=arm
 %else
+
+%if 0%{?simulator}
+export ARCH=emul
+%else
 export ARCH=i586
 %endif
 
-%build
+%endif
 
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH
 make %{?jobs:-j%jobs}
 
 %install

diff --git a/plugin/wpasupplicant/CMakeLists.txt b/plugin/wpasupplicant/CMakeLists.txt
index 0b0073b..2a3ddde 100755 (executable)
--- a/plugin/wpasupplicant/CMakeLists.txt
+++ b/plugin/wpasupplicant/CMakeLists.txt
@@ -20,8 +20,9 @@ SET(CMAKE_C_FLAGS_RELEASE "-O2")
 ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"")
 
 
-EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH")
-IF("${ARCH}" MATCHES "^arm.*")
+#EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH")
+SET(ARCH "${ARCHITECTURE}")
+IF("${ARCH}" MATCHES "^arm.*|.*86.*")
 
        SET(SRCS 
                src/wifi-direct-plugin.c

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 06731bf..81f2df1 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -26,8 +26,9 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
 SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
 SET(CMAKE_C_FLAGS_RELEASE "-O2")
 
-FIND_PROGRAM(UNAME NAMES uname)
-EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH")
+#FIND_PROGRAM(UNAME NAMES uname)
+#EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH")
+SET(ARCH "${ARCHITECTURE}")
 IF("${ARCH}" STREQUAL "arm")
        ADD_DEFINITIONS("-DTARGET")
        MESSAGE("add -DTARGET")
@@ -39,8 +40,9 @@ ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed")
 
 
-EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH")
-IF("${ARCH}" MATCHES "^arm.*")
+#EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH")
+message("${ARCH}")
+IF("${ARCH}" MATCHES "^arm.*|.*86.*")
        SET(SRCS
                 wifi-direct-main.c
                 wifi-direct-utils.c