changes to build system, emscipten progress (can render solid color, yippie!)
This commit is contained in:
@ -6,7 +6,7 @@ if(NOT CMAKE_BUILD_TYPE)
|
||||
set(CMAKE_BUILD_TYPE Debug)
|
||||
endif()
|
||||
|
||||
add_subdirectory($ENV{TWNROOT} $ENV{TWNROOT}/build)
|
||||
add_subdirectory($ENV{TWNROOT} ${CMAKE_BINARY_DIR}/twn)
|
||||
|
||||
set(SOURCE_FILES
|
||||
game.c
|
||||
|
@ -6,7 +6,7 @@ if(NOT CMAKE_BUILD_TYPE)
|
||||
set(CMAKE_BUILD_TYPE Debug)
|
||||
endif()
|
||||
|
||||
add_subdirectory($ENV{TWNROOT} $ENV{TWNROOT}/build)
|
||||
add_subdirectory($ENV{TWNROOT} ${CMAKE_BINARY_DIR}/twn)
|
||||
|
||||
set(SOURCE_FILES
|
||||
game.c
|
||||
|
@ -6,7 +6,7 @@ if(NOT CMAKE_BUILD_TYPE)
|
||||
set(CMAKE_BUILD_TYPE Debug)
|
||||
endif()
|
||||
|
||||
add_subdirectory($ENV{TWNROOT} $ENV{TWNROOT}/build)
|
||||
add_subdirectory($ENV{TWNROOT} ${CMAKE_BINARY_DIR}/twn)
|
||||
|
||||
set(SOURCE_FILES
|
||||
game.c
|
||||
|
@ -5,7 +5,7 @@ if(NOT CMAKE_BUILD_TYPE)
|
||||
set(CMAKE_BUILD_TYPE Debug)
|
||||
endif()
|
||||
|
||||
add_subdirectory($ENV{TWNROOT} $ENV{TWNROOT}/build)
|
||||
add_subdirectory($ENV{TWNROOT} ${CMAKE_BINARY_DIR}/twn)
|
||||
|
||||
set(SOURCE_FILES
|
||||
game.c
|
||||
@ -13,4 +13,4 @@ set(SOURCE_FILES
|
||||
)
|
||||
|
||||
cmake_path(GET CMAKE_SOURCE_DIR STEM LAST_ONLY GAME_PROJECT_NAME)
|
||||
use_townengine(${GAME_PROJECT_NAME} "${SOURCE_FILES}" ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
use_townengine("${SOURCE_FILES}" ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
@ -14,6 +14,7 @@ dev_id = "you"
|
||||
# Game runtime details
|
||||
[game]
|
||||
resolution = [ 640, 480 ]
|
||||
background_color = [ 255, 125, 0, 255 ]
|
||||
#debug = true
|
||||
|
||||
# Engine tweaks. You probably don't need to change these
|
||||
|
@ -7,7 +7,7 @@ if(NOT CMAKE_BUILD_TYPE)
|
||||
set(CMAKE_BUILD_TYPE Debug)
|
||||
endif()
|
||||
|
||||
add_subdirectory($ENV{TWNROOT} $ENV{TWNROOT}/build)
|
||||
add_subdirectory($ENV{TWNROOT} ${CMAKE_BINARY_DIR}/twn)
|
||||
|
||||
set(FLAGS
|
||||
$<$<NOT:$<BOOL:${TWN_FEATURE_DYNLIB_GAME}>>:--no-dynlib-game>
|
||||
@ -34,7 +34,7 @@ add_compile_definitions(LUA_32BITS=1)
|
||||
|
||||
set(SOURCE_FILES
|
||||
game.c
|
||||
state.h
|
||||
minilua.c
|
||||
)
|
||||
|
||||
use_townengine("${SOURCE_FILES}" ${TWN_OUT_DIR})
|
||||
|
@ -1,7 +1,6 @@
|
||||
#include "twn_game_api.h"
|
||||
|
||||
/* TODO: actually move it back it its own file, it doesn't give any compilation benefits */
|
||||
#define LUA_IMPL
|
||||
#include "minilua.h"
|
||||
|
||||
#include "state.h"
|
||||
|
2
apps/twnlua/minilua.c
Normal file
2
apps/twnlua/minilua.c
Normal file
@ -0,0 +1,2 @@
|
||||
#define LUA_IMPL
|
||||
#include "minilua.h"
|
Reference in New Issue
Block a user