Skip to content

Commit d0c5a62

Browse files
Merge pull request #37 from CedricGuillemet/dev-0.8
Imogen 0.8 - codename Unicorn Jabu
2 parents 06733a4 + 8264182 commit d0c5a62

File tree

106 files changed

+15794
-7704
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+15794
-7704
lines changed

CMakeLists.txt

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ file(GLOB_RECURSE SRC_FILES
1414
file(GLOB EXT_FILES
1515
${CMAKE_SOURCE_DIR}/ext/*.h
1616
${CMAKE_SOURCE_DIR}/ext/*.cpp
17-
${CMAKE_SOURCE_DIR}/ext/gl3w/GL/*.c
18-
${CMAKE_SOURCE_DIR}/ext/cmft/*.cpp
19-
${CMAKE_SOURCE_DIR}/ext/cmft/common/*.cpp
20-
${CMAKE_SOURCE_DIR}/ext/enkiTS-C-11/src/*.cpp
21-
${CMAKE_SOURCE_DIR}/ext/NativeFileDialog/src/nfd_common.c
17+
${CMAKE_SOURCE_DIR}/ext/gl3w/GL/*.c
18+
${CMAKE_SOURCE_DIR}/ext/cmft/*.cpp
19+
${CMAKE_SOURCE_DIR}/ext/cmft/common/*.cpp
20+
${CMAKE_SOURCE_DIR}/ext/enkiTS-C-11/src/*.cpp
21+
${CMAKE_SOURCE_DIR}/ext/NativeFileDialog/src/nfd_common.c
2222
)
2323

2424
if(WIN32)
@@ -68,15 +68,15 @@ find_package(OpenGL)
6868

6969
set (USE_MSVC_RUNTIME_LIBRARY_DLL true)
7070
IF (NOT USE_MSVC_RUNTIME_LIBRARY_DLL)
71-
#We statically link to reduce dependancies
72-
FOREACH(flag_var CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO CMAKE_CXX_FLAGS_RETAIL)
73-
IF(${flag_var} MATCHES "/MD")
74-
STRING(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
75-
ENDIF(${flag_var} MATCHES "/MD")
76-
IF(${flag_var} MATCHES "/MDd")
77-
STRING(REGEX REPLACE "/MDd" "/MTd" ${flag_var} "${${flag_var}}")
78-
ENDIF(${flag_var} MATCHES "/MDd")
79-
ENDFOREACH(flag_var)
71+
#We statically link to reduce dependancies
72+
FOREACH(flag_var CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO CMAKE_CXX_FLAGS_RETAIL)
73+
IF(${flag_var} MATCHES "/MD")
74+
STRING(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
75+
ENDIF(${flag_var} MATCHES "/MD")
76+
IF(${flag_var} MATCHES "/MDd")
77+
STRING(REGEX REPLACE "/MDd" "/MTd" ${flag_var} "${${flag_var}}")
78+
ENDIF(${flag_var} MATCHES "/MDd")
79+
ENDFOREACH(flag_var)
8080
ENDIF (NOT USE_MSVC_RUNTIME_LIBRARY_DLL)
8181

8282
set(SDL2_LIBS "SDL2" "SDL2main")
@@ -148,8 +148,8 @@ set_target_properties("Imogen" PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE
148148
#--------------------------------------------------------------------
149149
if(ENABLE_HIDECONSOLE_BUILD)
150150
if(MSVC)
151-
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup")
152-
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup")
151+
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup")
152+
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup")
153153
endif()
154154
endif()
155155

README.md

Lines changed: 3 additions & 1 deletion

bin/Imogen.exe

240 KB
Binary file not shown.
-28.2 KB
Binary file not shown.
-3.37 KB
Binary file not shown.
-7.27 KB
Binary file not shown.
-6.29 KB
Binary file not shown.
-11.8 KB
Binary file not shown.
-33.1 KB
Binary file not shown.
-19.4 KB
Binary file not shown.

0 commit comments

Comments
 (0)