Merge branch 'master' into Importer

2016-03-14 03:23:08 +01:00
parent 4c52f55bf0 94a10c3a8f
commit 407149fbb0
18 changed files with 53008 additions and 11817 deletions
@@ -53,10 +53,11 @@ target_link_libraries(Game
    ${LIBRARIES}
 )

-add_executable(TacticalZ
+add_executable(Axyz
 	main.cpp
+    ${CMAKE_SOURCE_DIR}/resources/TacticalZ.rc
 )
-target_link_libraries(TacticalZ
+target_link_libraries(Axyz
    Game
    ${LIBRARIES}
 )