diff options
| author | StapleButter <thetotalworm@gmail.com> | 2017-04-30 03:46:27 +0200 |
|---|---|---|
| committer | StapleButter <thetotalworm@gmail.com> | 2017-04-30 03:46:27 +0200 |
| commit | ee8d62188068bf49b0efa3b58b91e5a3e7580a19 (patch) | |
| tree | df8599e8e11f69911563f1d99584e4d19d5f5058 | |
| parent | 1b06b2765d8d89b688beec9287526633280d40ee (diff) | |
finalize CMake shit.
Windows will stick to CodeBlocks until making a cross-platform build system isn't a total trainwreck under Windows.
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | melon.rc | 8 | ||||
| -rw-r--r-- | melonDS.cbp | 8 | ||||
| -rw-r--r-- | src/version.h (renamed from src/version.h.cmake) | 2 |
6 files changed, 17 insertions, 19 deletions
@@ -1,5 +1,4 @@ bin obj *.depend -*.layout -src/version.h
\ No newline at end of file +*.layout
\ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 7c5c6f2..3da4b2d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,14 +2,8 @@ cmake_minimum_required(VERSION 2.8.11) SET(PROJECT_WX melonDS) PROJECT(${PROJECT_WX}) -SET(APP_VERSION 0.1) SET(INSTALL_PATH /usr/local/bin/) -SET(VERSION ${APP_VERSION}) - -CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/src/version.h.cmake - ${CMAKE_CURRENT_SOURCE_DIR}/src/version.h) - SET(SOURCES src/wx/main.cpp src/wx/EmuConfig.cpp @@ -30,10 +24,13 @@ SET(SOURCES src/NDSCart.cpp src/RTC.cpp src/SPI.cpp + src/SPU.cpp src/Wifi.cpp) +if (UNIX) find_package(GTK2 2.0 REQUIRED) include_directories(${GTK2_INCLUDE_DIRS}) +endif (UNIX) find_package(wxWidgets REQUIRED) include(${wxWidgets_USE_FILE}) @@ -19,6 +19,7 @@ Note: the DS-mode firmware in the 3DS isn't bootable, it only contains the bare As for the rest, the interface should be pretty straightforward. If you have a question, don't hesitate to ask, though! + How to build: Linux: @@ -29,8 +30,9 @@ Linux: Windows: * use CodeBlocks - -(build system not yet finished tho) + +Build system is not set in stone. + TODO LIST @@ -6,8 +6,8 @@ //include version information in .exe, modify these values to match your needs 1 VERSIONINFO -FILEVERSION 0,2,2,2 -PRODUCTVERSION 0,2,2,2 +FILEVERSION 0,3,3,3 +PRODUCTVERSION 0,3,3,3 FILETYPE VFT_APP { BLOCK "StringFileInfo" @@ -15,14 +15,14 @@ FILETYPE VFT_APP BLOCK "040904E4" { VALUE "CompanyName", "Melon Factory of Kuribo64" - VALUE "FileVersion", "0.2" + VALUE "FileVersion", "0.3" VALUE "FileDescription", "DS emulator, sorta. also 1st quality melon." VALUE "InternalName", "SDnolem" VALUE "LegalCopyright", "2016-2017 StapleButter & co." VALUE "LegalTrademarks", "" VALUE "OriginalFilename", "zafkflzdasd.exe" VALUE "ProductName", "melonDS" - VALUE "ProductVersion", "0.2" + VALUE "ProductVersion", "0.3" } } BLOCK "VarFileInfo" diff --git a/melonDS.cbp b/melonDS.cbp index bc0ee38..a1c6edb 100644 --- a/melonDS.cbp +++ b/melonDS.cbp @@ -14,11 +14,11 @@ <Option compiler="gcc" /> <Compiler> <Add option="-m64" /> - <Add option="-g" /> - <Add option="-D_FILE_OFFSET_BITS=64" /> - <Add option="-D__WXMSW__" /> <Add option="-I$(TARGET_COMPILER_DIR)/lib/wx/include/msw-unicode-static-3.0" /> <Add option="-I$(TARGET_COMPILER_DIR)/include/wx-3.0" /> + <Add option="-gdwarf-2" /> + <Add option="-D_FILE_OFFSET_BITS=64" /> + <Add option="-D__WXMSW__" /> </Compiler> <Linker> <Add option="-m64" /> @@ -125,9 +125,9 @@ <Compiler> <Add option="-O2" /> <Add option="-m64" /> - <Add option="-g" /> <Add option="-I$(TARGET_COMPILER_DIR)/lib/wx/include/msw-unicode-static-3.0" /> <Add option="-I$(TARGET_COMPILER_DIR)/include/wx-3.0" /> + <Add option="-gdwarf-2" /> <Add option="-D_FILE_OFFSET_BITS=64" /> <Add option="-D__WXMSW__" /> </Compiler> diff --git a/src/version.h.cmake b/src/version.h index 50656e4..d8a26d2 100644 --- a/src/version.h.cmake +++ b/src/version.h @@ -19,7 +19,7 @@ #ifndef VERSION_H #define VERSION_H -#define MELONDS_VERSION "@VERSION@" +#define MELONDS_VERSION "0.3" #define MELONDS_URL "http://melonds.kuribo64.net/" |