diff --git a/CMakeLists.txt b/CMakeLists.txt index 39e57cd..278dcd9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.10) project(nasal VERSION 10.1) +message("CMAKE_HOST_SYSTEM_NAME: ${CMAKE_HOST_SYSTEM_NAME}") + # -std=c++14 -Wshadow -Wall set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED True) @@ -24,12 +26,20 @@ add_library(nasock SHARED ${CMAKE_SOURCE_DIR}/module/nasocket.cpp) target_include_directories(nasock PRIVATE ${CMAKE_SOURCE_DIR}) add_executable(nasal main.cpp) -target_link_libraries(nasal dl) + +if(CMAKE_HOST_SYSTEM_NAME MATCHES "Windows") + message("Ignore linking dl lib") +else() + target_link_libraries(nasal dl) +endif() + target_include_directories(nasal PRIVATE ${CMAKE_SOURCE_DIR}) -add_custom_command( - TARGET nasal POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy - ${CMAKE_SOURCE_DIR}/build/nasal - ${CMAKE_SOURCE_DIR}/nasal -) \ No newline at end of file +if(NOT CMAKE_HOST_SYSTEM_NAME MATCHES "Windows") + add_custom_command( + TARGET nasal POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy + ${CMAKE_SOURCE_DIR}/build/nasal + ${CMAKE_SOURCE_DIR}/nasal + ) +endif() \ No newline at end of file diff --git a/nasal_builtin.h b/nasal_builtin.h index f8653da..cb492fd 100644 --- a/nasal_builtin.h +++ b/nasal_builtin.h @@ -8,6 +8,9 @@ #include #else #pragma warning (disable:4566) // i know i'm using utf-8, fuck you +#pragma warning (disable:4244) +#pragma warning (disable:4267) +#pragma warning (disable:4996) #define _CRT_SECURE_NO_DEPRECATE 1 #define _CRT_NONSTDC_NO_DEPRECATE 1 #include diff --git a/nasal_codegen.h b/nasal_codegen.h index f503b90..ddae5b5 100644 --- a/nasal_codegen.h +++ b/nasal_codegen.h @@ -9,6 +9,11 @@ #include #include +#ifdef _MSC_VER +#pragma warning (disable:4244) +#pragma warning (disable:4267) +#endif + class codegen { private: u16 fileindex; diff --git a/nasal_gc.h b/nasal_gc.h index fe51d8b..271405a 100644 --- a/nasal_gc.h +++ b/nasal_gc.h @@ -1,4 +1,9 @@ #pragma once +#ifdef _MSC_VER +#pragma warning (disable:4244) +#pragma warning (disable:4267) +#pragma warning (disable:4102) +#endif #ifndef _MSC_VER #include diff --git a/nasal_lexer.h b/nasal_lexer.h index 27813ed..b6cae34 100644 --- a/nasal_lexer.h +++ b/nasal_lexer.h @@ -1,4 +1,9 @@ #pragma once +#ifdef _MSC_VER +#pragma warning (disable:4244) +#pragma warning (disable:4267) +#pragma warning (disable:4102) +#endif #include #include diff --git a/nasal_vm.h b/nasal_vm.h index a90a862..04de83c 100644 --- a/nasal_vm.h +++ b/nasal_vm.h @@ -7,6 +7,12 @@ #include "nasal_gc.h" #include "nasal_codegen.h" +#ifdef _MSC_VER +#pragma warning (disable:4244) +#pragma warning (disable:4267) +#pragma warning (disable:4102) +#endif + class vm { protected: