gxruntime: Move into runtime

2019-01-18 17:05:15 +01:00
parent c9ff5b8ca4
commit 008eefdc1e
2 changed files with 13 additions and 114 deletions
@@ -30,10 +30,22 @@ if(WIN32)
 	)
 endif()

+# All Warnings, Extra Warnings, Pedantic
+If(MSVC)
+	# Force to always compile with W4
+	If(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
+		String(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+	Else()
+		Set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
+	EndIf()
+ElseIf(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+	# Update If necessary
+	Set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic")
+EndIf()
+
 # Projects
 add_subdirectory(config)
 add_subdirectory(stdutil)
-add_subdirectory(gxruntime)
 add_subdirectory(runtime)
 add_subdirectory(linker)
 add_subdirectory(debugger)
@@ -1,113 +0,0 @@
-project(gxruntime)
-
-add_library(${PROJECT_NAME} STATIC
-	"asmcoder.hpp"
-	"asmcoder.cpp"
-	"ddutil.hpp"
-	"ddutil.cpp"
-	"graphicsruntime.hpp"
-	"gxaudio.hpp"
-	"gxaudio.cpp"
-	"gxcanvas.hpp"
-	"gxcanvas.cpp"
-	"gxchannel.hpp"
-	"gxchannel.cpp"
-	"gxdevice.hpp"
-	"gxdevice.cpp"
-	"gxdir.hpp"
-	"gxdir.cpp"
-	"gxfilesystem.hpp"
-	"gxfilesystem.cpp"
-	"gxfont.hpp"
-	"gxfont.cpp"
-	"gxgraphics.hpp"
-	"gxgraphics.cpp"
-	"gxinput.hpp"
-	"gxinput.cpp"
-	"gxlight.hpp"
-	"gxlight.cpp"
-	"gxmesh.hpp"
-	"gxmesh.cpp"
-	"gxmovie.hpp"
-	"gxmovie.cpp"
-	"gxmusic.hpp"
-	"gxmusic.cpp"
-	"gxruntime.hpp"
-	"gxruntime.cpp"
-	"gxscene.hpp"
-	"gxscene.cpp"
-	"gxsound.hpp"
-	"gxsound.cpp"
-	"gxtimer.hpp"
-	"gxtimer.cpp"
-	"std.hpp"
-	"std.cpp"
-)
-
-target_link_libraries(${PROJECT_NAME}
-	PRIVATE
-		stdutil
-	PUBLIC 
-		shell32
-		winmm
-		${fmod_LIBRARIES}
-		${FreeImage_LIBRARIES}
-)
-
-target_include_directories(${PROJECT_NAME}
-	PRIVATE
-		"${fmod_INCLUDE_DIRS}"
-		"${FreeImage_INCLUDE_DIRS}"
-	PUBLIC
-		${PROJECT_SOURCE_DIR}
-)
-
-if (WIN32)
-	target_compile_definitions(${PROJECT_NAME}
-		PRIVATE
-			_CRT_SECURE_NO_WARNINGS
-			# windows.hpp
-			WIN32_LEAN_AND_MEAN
-			NOGPICAPMASKS
-			#NOVIRTUALKEYCODES
-			#NOWINMESSAGES
-			#NOWINSTYLES
-			#NOSYSMETRICS
-			NOMENUS
-			NOICONS
-			#NOKEYSTATES
-			NOSYSCOMMANDS
-			NORASTEROPS
-			#NOSHOWWINDOW
-			NOATOM
-			NOCLIPBOARD
-			NOCOLOR
-			NOCTLMGR
-			NODRAWTEXT
-			#NOGDI
-			NOKERNEL
-			#NOUSER
-			NONLS
-			#NOMB
-			NOMEMMGR
-			NOMETAFILE
-			#NOMSG
-			NOOPENFILE
-			NOSCROLL
-			NOSERVICE
-			NOSOUND
-			#NOTEXTMETRIC
-			NOWH
-			#NOWINOFFSETS
-			NOCOMM
-			NOKANJI
-			NOHELP
-			NOPROFILER
-			NODEFERWINDOWPOS
-			NOMCX
-			NOIME
-			NOMDI
-			NOMINMAX
-			NOINOUT
-	)
-endif()