Merge branch 'sokol' of https://github.com/nesbox/TIC-80 into sokol

This commit is contained in:
Vadim Grigoruk 2018-09-27 18:54:29 +03:00
commit 004dc15c3f
3 changed files with 64 additions and 8 deletions

View File

@ -495,12 +495,6 @@ target_compile_definitions(tic80prolib PRIVATE TIC80_PRO)
set(TIC80_OUTPUTS ${TIC80_OUTPUTS} tic80-sokol tic80pro-sokol)
if(APPLE)
set(TIC80_SRC_COMMON ${TIC80_SRC_COMMON} src/ext/file_dialog.m)
else()
set(TIC80_SRC_COMMON ${TIC80_SRC_COMMON} src/ext/file_dialog.c)
endif()
foreach(TIC80_OUTPUT ${TIC80_OUTPUTS})
if(TIC80_OUTPUT MATCHES "-sokol")
@ -509,9 +503,11 @@ foreach(TIC80_OUTPUT ${TIC80_OUTPUTS})
set(SOKOL_RENDERER FALSE)
endif()
message("SOKOL_RENDERER ${SOKOL_RENDERER}")
set(TIC80_SRC src/ext/file_dialog.c)
set(TIC80_SRC ${TIC80_SRC_COMMON})
if(APPLE)
set(TIC80_SRC ${TIC80_SRC} src/ext/file_dialog.m)
endif()
if(SOKOL_RENDERER)
set(TIC80_SRC ${TIC80_SRC} src/system/sokol.c)

View File

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>TIC-80 Sokol</string>
<key>CFBundleExecutable</key>
<string>tic80-sokol</string>
<key>CFBundleIconFile</key>
<string>tic80.icns</string>
<key>CFBundleIdentifier</key>
<string>com.nesbox.tic</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>TIC-80 Sokol</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.70.6</string>
<key>CFBundleVersion</key>
<string>0.70.6</string>
<key>NSHumanReadableCopyright</key>
<string>http://tic.computer © 2017</string>
<key>NSHighResolutionCapable</key>
<true/>
</dict>
</plist>

View File

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>TIC-80 Pro Sokol</string>
<key>CFBundleExecutable</key>
<string>tic80pro-sokol</string>
<key>CFBundleIconFile</key>
<string>tic80.icns</string>
<key>CFBundleIdentifier</key>
<string>com.nesbox.tic</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>TIC-80 Pro Sokol</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.70.6</string>
<key>CFBundleVersion</key>
<string>0.70.6</string>
<key>NSHumanReadableCopyright</key>
<string>http://tic.computer © 2017</string>
<key>NSHighResolutionCapable</key>
<true/>
</dict>
</plist>