1berry/pawn-compiler
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #143 from Daniel-Cortez/master

Browse Source 
Minor fixes/adjustments for the build script
This commit is contained in:
Zeex 2017-02-02 21:15:42 +07:00 committed by GitHub
commit a05033be20
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/compiler/CMakeLists.txt
View File

@ -50,7 +50,8 @@ if(UNIX)
link_libraries(pthread) link_libraries(pthread)
endif() endif()
configure_file(version.h.in version.h) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in
${CMAKE_CURRENT_BINARY_DIR}/version.h)
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
# The Pawn compiler shared library # The Pawn compiler shared library
@ -73,7 +74,7 @@ set(PAWNC_SRCS
scmemfil.c scmemfil.c
scstate.c scstate.c
scvars.c scvars.c
${CMAKE_BINARY_DIR}/version.h) version.h)
set_source_files_properties(sc1.c COMPILE_FLAGS -DNO_MAIN) set_source_files_properties(sc1.c COMPILE_FLAGS -DNO_MAIN)
if(WIN32) if(WIN32)
set(PAWNC_SRCS ${PAWNC_SRCS} libpawnc.rc) set(PAWNC_SRCS ${PAWNC_SRCS} libpawnc.rc)
@ -81,7 +82,7 @@ if(WIN32)
if(BORLAND) if(BORLAND)
# Borland linker uses a DEF file if one is in the output directory # Borland linker uses a DEF file if one is in the output directory
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpawnc.def.borland configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpawnc.def.borland
${CMAKE_BINARY_DIR}/pawnc.def ${CMAKE_CURRENT_BINARY_DIR}/pawnc.def
COPYONLY) COPYONLY)
else() else()
# Microsoft Visual C/C++ supports a DEF file as if it were a source file # Microsoft Visual C/C++ supports a DEF file as if it were a source file
@ -100,6 +101,7 @@ if(WATCOM) #Watcom C/C++ does not support a .DEF file for the exports
elseif(MINGW) elseif(MINGW)
set_target_properties(pawnc PROPERTIES LINK_FLAGS set_target_properties(pawnc PROPERTIES LINK_FLAGS
"-Wl,--enable-stdcall-fixup") "-Wl,--enable-stdcall-fixup")
set_target_properties(pawnc PROPERTIES PREFIX "")
endif() endif()
# The Pawn compiler driver (console program) # The Pawn compiler driver (console program)
@ -109,7 +111,7 @@ if(WIN32)
if(BORLAND) if(BORLAND)
# Borland linker uses a DEF file if one is in the output directory # Borland linker uses a DEF file if one is in the output directory
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pawncc.def.borland configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pawncc.def.borland
${CMAKE_BINARY_DIR}/pawncc.def ${CMAKE_CURRENT_BINARY_DIR}/pawncc.def
COPYONLY) COPYONLY)
else() else()
# Microsoft Visual C/C++ supports a DEF file as if it were a source file # Microsoft Visual C/C++ supports a DEF file as if it were a source file