dan
/
TIC-80-guile
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmake fixes for mingw

This commit is contained in:
Vadim Grigoruk 2018-09-04 16:42:29 +03:00
parent bb735b883b
commit 2aadcb08d3
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
CMakeLists.txt
View File

@ -216,6 +216,10 @@ if(NOT EMSCRIPTEN)
target_include_directories(sdl-renderer PRIVATE include) target_include_directories(sdl-renderer PRIVATE include)
target_include_directories(sdl-renderer PRIVATE src) target_include_directories(sdl-renderer PRIVATE src)
if(MINGW)
target_link_libraries(sdl-renderer mingw32)
endif()
add_dependencies(sdl-renderer tic80core SDL2-static SDL2main) add_dependencies(sdl-renderer tic80core SDL2-static SDL2main)
target_link_libraries(sdl-renderer tic80core SDL2-static SDL2main) target_link_libraries(sdl-renderer tic80core SDL2-static SDL2main)
endif() endif()
@ -400,7 +404,7 @@ foreach(TIC80_OUTPUT ${TIC80_OUTPUTS})
add_dependencies(${TIC80_OUTPUT}lib tic80core zlib) add_dependencies(${TIC80_OUTPUT}lib tic80core zlib)
target_link_libraries(${TIC80_OUTPUT}lib tic80core zlib) target_link_libraries(${TIC80_OUTPUT}lib tic80core zlib)
endforeach(CART_FILE) endforeach()
target_compile_definitions(tic80prolib PRIVATE TIC80_PRO) target_compile_definitions(tic80prolib PRIVATE TIC80_PRO)
@ -422,9 +426,7 @@ endif()
foreach(TIC80_OUTPUT ${TIC80_OUTPUTS}) foreach(TIC80_OUTPUT ${TIC80_OUTPUTS})
if(WIN32) if(WIN32)
# TODO: uncomment this (temporary disabled for VS2017) set(TIC80_SRC ${TIC80_SRC} build/windows/tic80.rc)
# set(TIC80_SRC ${TIC80_SRC} build/windows/tic80.rc)
add_executable(${TIC80_OUTPUT} WIN32 ${TIC80_SRC}) add_executable(${TIC80_OUTPUT} WIN32 ${TIC80_SRC})
else() else()
add_executable(${TIC80_OUTPUT} ${TIC80_SRC}) add_executable(${TIC80_OUTPUT} ${TIC80_SRC})
@ -435,10 +437,13 @@ foreach(TIC80_OUTPUT ${TIC80_OUTPUTS})
target_include_directories(${TIC80_OUTPUT} PRIVATE 3rd-party/sdl-gpu/include) target_include_directories(${TIC80_OUTPUT} PRIVATE 3rd-party/sdl-gpu/include)
target_include_directories(${TIC80_OUTPUT} PRIVATE 3rd-party/SDL2_net-2.0.1) target_include_directories(${TIC80_OUTPUT} PRIVATE 3rd-party/SDL2_net-2.0.1)
if(NOT EMSCRIPTEN) if(MINGW)
add_dependencies(${TIC80_OUTPUT} SDL2-static SDL2main) target_link_libraries(${TIC80_OUTPUT} mingw32)
target_link_libraries(${TIC80_OUTPUT} SDL2-static SDL2main) endif()
if(NOT EMSCRIPTEN)
add_dependencies(${TIC80_OUTPUT} SDL2main SDL2-static)
target_link_libraries(${TIC80_OUTPUT} SDL2-static SDL2main)
endif() endif()
add_dependencies(${TIC80_OUTPUT} ${TIC80_OUTPUT}lib sdlnet sdlgpu) add_dependencies(${TIC80_OUTPUT} ${TIC80_OUTPUT}lib sdlnet sdlgpu)

8
build/windows/tic80.rc
View File

@ -1,8 +1,8 @@
101 ICON "icon.ico" 101 ICON "icon.ico"
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION 0,60,3,0 FILEVERSION 0,70,6,0
PRODUCTVERSION 0,60,3,0 PRODUCTVERSION 0,70,6,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -19,12 +19,12 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Nesbox" VALUE "CompanyName", "Nesbox"
VALUE "FileDescription", "TIC-80" VALUE "FileDescription", "TIC-80"
VALUE "FileVersion", "0.60.3.0" VALUE "FileVersion", "0.70.6.0"
VALUE "InternalName", "tic80.exe" VALUE "InternalName", "tic80.exe"
VALUE "LegalCopyright", "http://tic.computer (C) 2017" VALUE "LegalCopyright", "http://tic.computer (C) 2017"
VALUE "OriginalFilename", "tic80.exe" VALUE "OriginalFilename", "tic80.exe"
VALUE "ProductName", "TIC-80" VALUE "ProductName", "TIC-80"
VALUE "ProductVersion", "0.60.3.0" VALUE "ProductVersion", "0.70.6.0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

1
src/ext/file_dialog.c
View File

@ -30,7 +30,6 @@
#include <commdlg.h> #include <commdlg.h>
#include <stdio.h> #include <stdio.h>
FILE* _wfopen(const wchar_t *, const wchar_t *);
wchar_t* wcsrchr(const wchar_t *, wchar_t); wchar_t* wcsrchr(const wchar_t *, wchar_t);
wchar_t* wcscpy(wchar_t *, const wchar_t *); wchar_t* wcscpy(wchar_t *, const wchar_t *);