diff --git a/desmume/configure.ac b/desmume/configure.ac index 8f9dd68e0..bb1cd901c 100644 --- a/desmume/configure.ac +++ b/desmume/configure.ac @@ -211,25 +211,6 @@ if test "x$HAVE_ALSA" = "xno"; then fi fi -dnl - Check for wxWidgets - -dnl - if --enable-wxwidgets is used, check for it -AC_ARG_ENABLE([wxwidgets], - [AC_HELP_STRING([--enable-wxwidgets], [Enable cross platform wx widgets frontend])], - [wxwidgets=$enableval], - [wxwidgets=no]) -if test "x$wxwidgets" = "xyes" ; then - m4_include(wxwin.m4) - AM_PATH_WXCONFIG([2.4.0], wxwin=yes) - if test "x$wxwin" = "xyes"; then - AC_SUBST(WX_CPPFLAGS) - AC_SUBST(WX_LIBS) - AC_DEFINE([WANT_WX]) - fi -fi - -AM_CONDITIONAL([HAVE_WX], [test "x$wxwidgets" = "xyes"]) - dnl - Determine which UIs to build and if po/ should be included PO_DIR="po" PO_MAKEFILE="po/Makefile.in" @@ -237,9 +218,6 @@ UI_DIR="cli $UI_DIR" if test "x$HAVE_GTK" = "xyes"; then UI_DIR="gtk $UI_DIR" fi -if test "x$wxwin" = "xyes"; then - UI_DIR="wx $UI_DIR" -fi if test "x$HAVE_LIBGLADE" = "xyes"; then UI_DIR="gtk-glade $UI_DIR" @@ -362,7 +340,6 @@ AC_CONFIG_FILES([Makefile src/gtk/doc/Makefile src/gtk-glade/Makefile src/gtk-glade/doc/Makefile - src/wx/Makefile src/gdbstub/Makefile autopackage/default.apspec ]) diff --git a/desmume/po/POTFILES.skip b/desmume/po/POTFILES.skip index ac9aea03a..e69de29bb 100644 --- a/desmume/po/POTFILES.skip +++ b/desmume/po/POTFILES.skip @@ -1,7 +0,0 @@ -src/wx/PadSimple/GUI/ConfigDlg.cpp -src/wxdlg/wxdlg3dViewer.cpp -src/wxdlg/wxcontrolsconfigdialog.cpp -src/windows/libelf_libdwarf/libelf/errors.h -src/windows/wx/include/wx/msw/ole/oleutils.h -src/windows/wx/include/wx/unix/pipe.h -src/windows/wx/include/wx/xti.h diff --git a/desmume/src/GPU_osd.cpp b/desmume/src/GPU_osd.cpp index e3c99fda2..d30ce3735 100644 --- a/desmume/src/GPU_osd.cpp +++ b/desmume/src/GPU_osd.cpp @@ -552,7 +552,7 @@ void DrawHUD() drawPad(Hud.GraphicalInputDisplay.x, Hud.GraphicalInputDisplay.y, 2.5); } - #if defined(WIN32) && !defined(WXPORT) + #if defined(WIN32) if (CommonSettings.hud.ShowMicrophone) { osd->addFixed(Hud.Microphone.x, Hud.Microphone.y, "%03d [%07d]",MicDisplay, Hud.cpuloopIterationCount); diff --git a/desmume/src/NDSSystem.h b/desmume/src/NDSSystem.h index 018bb5bc4..ae408cc1c 100644 --- a/desmume/src/NDSSystem.h +++ b/desmume/src/NDSSystem.h @@ -33,7 +33,7 @@ #include -#if defined(_WINDOWS) && !defined(WXPORT) +#if defined(_WINDOWS) #include "pathsettings.h" #endif diff --git a/desmume/src/OGLRender.h b/desmume/src/OGLRender.h index 546ce3faf..1e967fbf7 100644 --- a/desmume/src/OGLRender.h +++ b/desmume/src/OGLRender.h @@ -28,7 +28,7 @@ #ifndef OGLRENDER_3_2_H -#if defined(_WIN32) && !defined(WXPORT) +#if defined(_WIN32) #define WIN32_LEAN_AND_MEAN #include #include diff --git a/desmume/src/OGLRender_3_2.h b/desmume/src/OGLRender_3_2.h index 036bc39e9..b7eb35dab 100644 --- a/desmume/src/OGLRender_3_2.h +++ b/desmume/src/OGLRender_3_2.h @@ -20,7 +20,7 @@ #ifndef OGLRENDER_3_2_H #define OGLRENDER_3_2_H -#if defined(_WIN32) && !defined(WXPORT) +#if defined(_WIN32) #define WIN32_LEAN_AND_MEAN #include #include diff --git a/desmume/src/driver.cpp b/desmume/src/driver.cpp index 417d600ec..93f9e29d2 100644 --- a/desmume/src/driver.cpp +++ b/desmume/src/driver.cpp @@ -22,193 +22,6 @@ #include "texcache.h" -#ifdef HAVE_WX -#include "wx/wxprec.h" -#include "wx/wx.h" -#include "wxdlg/wxdlg3dViewer.h" - -const int kViewportWidth = 256; -const int kViewportHeight = 192; - -static SoftRasterizerEngine engine; -static Fragment _screen[kViewportWidth*kViewportHeight]; -static FragmentColor _screenColor[kViewportWidth*kViewportHeight]; - -extern void _HACK_Viewer_ExecUnit(SoftRasterizerEngine* engine); - -class Mywxdlg3dViewer : public wxdlg3dViewer -{ -public: - Mywxdlg3dViewer() - : wxdlg3dViewer(NULL) - {} - - virtual void RepaintPanel() - { - Refresh(false); - Update(); - } - - void NewFrame() - { - listPolys->SetItemCount(viewer3d_state->polylist.count); - labelFrameCounter->SetLabel(wxString::Format(wxT("Frame: %d"),viewer3d_state->frameNumber)); - labelUserPolycount->SetLabel(wxString::Format(wxT("User Polys: %d"),viewer3d_state->polylist.count)); - labelFinalPolycount->SetLabel(wxString::Format(wxT("Final Polys: %d"),viewer3d_state->polylist.count)); - //tree->DeleteAllItems(); - //tree->Freeze(); - //wxTreeItemId root = tree->AddRoot(""); - //for(int i=0;ipolylist.count;i++) - //{ - // tree->AppendItem(root,"hai kirin"); - //} - //tree->Thaw(); - } - - virtual wxString OnGetItemText(const wxListCtrl* list, long item, long column) const - { - return wxT("hi"); - } - - virtual void OnListPolysSelected( wxListEvent& event ) - { - panelTexture->Refresh(false); - engine._debug_drawClippedUserPoly = GetSelectedListviewItem(listPolys); - } - - void RedrawPanel(wxClientDC* dc) - { - //------------ - //do the 3d work.. - engine.polylist = &viewer3d_state->polylist; - engine.vertlist = &viewer3d_state->vertlist; - engine.indexlist = &viewer3d_state->indexlist; - engine.screen = _screen; - engine.screenColor = _screenColor; - engine.width = kViewportWidth; - engine.height = kViewportHeight; - - engine.updateFogTable(); - - engine.initFramebuffer(kViewportWidth,kViewportHeight,gfx3d.state.enableClearImage?true:false); - engine.updateToonTable(); - engine.updateFloatColors(); - engine.performClipping(checkMaterialInterpolate->IsChecked()); - engine.performViewportTransforms(kViewportWidth,kViewportHeight); - engine.performBackfaceTests(); - engine.performCoordAdjustment(false); - engine.setupTextures(false); - - _HACK_Viewer_ExecUnit(&engine); - //------------ - - //dc.SetBackground(*wxGREEN_BRUSH); dc.Clear(); - u8 framebuffer[kViewportWidth*kViewportHeight*3]; - for(int y=0,i=0;yDrawBitmap(bitmap,0,0); - } - - virtual void _OnPaintPanel( wxPaintEvent& event ) - { - wxClientDC dc(wxDynamicCast(event.GetEventObject(), wxWindow)); - RedrawPanel(&dc); - } - - int GetSelectedListviewItem(wxListCtrl* list) - { - return list->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - } - - virtual void OnPaintPanelTexture( wxPaintEvent& event ) - { - wxPaintDC dc(wxDynamicCast(event.GetEventObject(), wxWindow)); - dc.SetBackground(*wxBLACK_BRUSH); dc.Clear(); - - int selection = GetSelectedListviewItem(listPolys); - if(selection < 0) return; - if(selection>=viewer3d_state->polylist.count) return; - - POLY& poly = viewer3d_state->polylist.list[selection]; - - TexCacheItem* texkey = TexCache_SetTexture(TexFormat_32bpp,poly.texParam,poly.texPalette); - const u32 w = texkey->sizeX; - const u32 h = texkey->sizeY; - u8* const bmpdata = new u8[w*h*4]; - for(u32 i=0;idecoded[i*4]; - bmpdata[i*3+1] = texkey->decoded[i*4+1]; - bmpdata[i*3+2] = texkey->decoded[i*4+2]; - } - for(u32 i=0;idecoded[i*4+3]; - - - wxImage image(w,h,false); - image.InitAlpha(); - image.SetData(bmpdata,true); - image.SetAlpha(bmpdata+w*h*3,true); - wxBitmap bitmap(image); - double xscale = (double)panelTexture->GetSize().x / w; - double yscale = (double)panelTexture->GetSize().y / h; - - dc.SetUserScale(xscale,yscale); - dc.DrawBitmap(bitmap,0,0); - delete[] bmpdata; - } -}; - -class VIEW3D_Driver_WX : public VIEW3D_Driver -{ -public: - VIEW3D_Driver_WX() - : viewer(NULL) - {} - ~VIEW3D_Driver_WX() - { - delete viewer; - } - - virtual bool IsRunning() { return viewer != NULL; } - - virtual void Launch() - { - if(viewer) return; - delete viewer; - viewer = new Mywxdlg3dViewer(); - viewer->Show(true); - } - - void Close() - { - delete viewer; - viewer = NULL; - } - - virtual void NewFrame() - { - if(!viewer) return; - if(!viewer->IsShown()) { - Close(); - return; - } - - viewer->NewFrame(); - viewer->RepaintPanel(); - } - -private: - Mywxdlg3dViewer *viewer; -}; - -#endif - static VIEW3D_Driver nullView3d; BaseDriver::BaseDriver() : view3d(NULL) @@ -225,9 +38,6 @@ void BaseDriver::VIEW3D_Shutdown() void BaseDriver::VIEW3D_Init() { VIEW3D_Shutdown(); -#ifdef HAVE_WX - view3d = new VIEW3D_Driver_WX(); -#endif } BaseDriver::~BaseDriver() diff --git a/desmume/src/lua-engine.cpp b/desmume/src/lua-engine.cpp index 5de4d4d7e..22f81d0a1 100644 --- a/desmume/src/lua-engine.cpp +++ b/desmume/src/lua-engine.cpp @@ -29,7 +29,7 @@ #include "GPU_osd.h" #include "saves.h" #include "emufile.h" -#if defined(WIN32) && !defined(WXPORT) +#if defined(WIN32) #include #include "main.h" #include "video.h" @@ -482,7 +482,7 @@ static int doPopup(lua_State* L, const char* deftype, const char* deficon) static const char * const titles [] = {"Notice", "Question", "Warning", "Error"}; const char* answer = "ok"; -#if defined(_WIN32) && !defined(WXPORT) +#if defined(_WIN32) static const int etypes [] = {MB_OK, MB_YESNO, MB_YESNOCANCEL, MB_OKCANCEL, MB_ABORTRETRYIGNORE}; static const int eicons [] = {MB_ICONINFORMATION, MB_ICONQUESTION, MB_ICONWARNING, MB_ICONERROR}; // DialogsOpen++; @@ -1345,7 +1345,7 @@ bool luabitop_validate(lua_State *L) // originally named as luaopen_bit if (b != (UBits)1437217655L || BAD_SAR) { /* Perform a simple self-test. */ const char *msg = "compiled with incompatible luaconf.h"; #ifdef LUA_NUMBER_DOUBLE -#if defined(_WIN32) && !defined(WXPORT) +#if defined(_WIN32) if (b == (UBits)1610612736L) msg = "use D3DCREATE_FPU_PRESERVE with DirectX"; #endif @@ -1417,7 +1417,7 @@ void indicateBusy(lua_State* L, bool busy) lua_pop(L, 1); } */ -#if defined(_WIN32) && !defined(WXPORT) +#if defined(_WIN32) int uid = luaStateToUIDMap[L->l_G->mainthread]; HWND hDlg = (HWND)uid; char str [1024]; @@ -1471,7 +1471,7 @@ void LuaRescueHook(lua_State* L, lua_Debug *dbg) if(!info.panic) { SPU_ClearOutputBuffer(); -#if defined(ASK_USER_ON_FREEZE) && defined(_WIN32) && !defined(WXPORT) +#if defined(ASK_USER_ON_FREEZE) && defined(_WIN32) DialogsOpen++; int answer = MessageBox(HWnd, "A Lua script has been running for quite a while. Maybe it is in an infinite loop.\n\nWould you like to stop the script?\n\n(Yes to stop it now,\n No to keep running and not ask again,\n Cancel to keep running but ask again later)", "Lua Alert", MB_YESNOCANCEL | MB_DEFBUTTON3 | MB_ICONASTERISK); DialogsOpen--; @@ -2594,7 +2594,7 @@ static void prepare_reading() } else { -#if defined(WIN32) && !defined(WXPORT) +#if defined(WIN32) extern VideoInfo video; curGuiData.data = video.buffer; curGuiData.stridePix = 256; @@ -3442,7 +3442,7 @@ static void GetCurrentScriptDir(char* buffer, int bufLen) DEFINE_LUA_FUNCTION(emu_openscript, "filename") { -#if defined(WIN32) && !defined(WXPORT) +#if defined(WIN32) char curScriptDir[1024]; GetCurrentScriptDir(curScriptDir, 1024); // make sure we can always find scripts that are in the same directory as the current script const char* filename = lua_isstring(L,1) ? lua_tostring(L,1) : NULL; extern const char* OpenLuaScript(const char* filename, const char* extraDirToCheck, bool makeSubservient); @@ -3464,7 +3464,7 @@ DEFINE_LUA_FUNCTION(emu_reset, "") static bool IsLuaMenuItem(PlatformMenuItem menuItem) { -#if defined(WIN32) && !defined(WXPORT) +#if defined(WIN32) return (menuItem >= IDC_LUAMENU_RESERVE_START && menuItem <= IDC_LUAMENU_RESERVE_END); #else return false; @@ -3473,7 +3473,7 @@ static bool IsLuaMenuItem(PlatformMenuItem menuItem) static bool SearchFreeMenuItem(PlatformMenu menu, PlatformMenuItem& menuItem) { -#if defined(WIN32) && !defined(WXPORT) +#if defined(WIN32) for (UINT menuItemId = IDC_LUAMENU_RESERVE_START; menuItemId <= IDC_LUAMENU_RESERVE_END; menuItemId++) { MENUITEMINFO mii; @@ -3495,7 +3495,7 @@ static bool SearchFreeMenuItem(PlatformMenu menu, PlatformMenuItem& menuItem) static PlatformMenu AddSubMenu(PlatformMenu topMenu, PlatformMenu menu, const char* menuName) { -#if defined(WIN32) && !defined(WXPORT) +#if defined(WIN32) LuaContextInfo& info = GetCurrentInfo(); MENUITEMINFO mii; @@ -3553,7 +3553,7 @@ static PlatformMenu AddSubMenu(PlatformMenu topMenu, PlatformMenu menu, const ch bool AddMenuEntries(PlatformMenu topMenu, PlatformMenu menu) { -#if defined(WIN32) && !defined(WXPORT) +#if defined(WIN32) LuaContextInfo& info = GetCurrentInfo(); lua_State* L = info.L; luaL_checktype(L, -1, LUA_TTABLE); @@ -3657,7 +3657,7 @@ bool AddMenuEntries(PlatformMenu topMenu, PlatformMenu menu) DEFINE_LUA_FUNCTION(emu_addmenu, "menuName, menuEntries") { -#if defined(WIN32) && !defined(WXPORT) +#if defined(WIN32) int nargs = lua_gettop(L); if (nargs > 1 && !lua_isnil(L, 1)) { @@ -3693,7 +3693,7 @@ DEFINE_LUA_FUNCTION(emu_setmenuiteminfo, "menuItem, infoTable") { luaL_checktype(L, 1, LUA_TFUNCTION); luaL_checktype(L, 2, LUA_TTABLE); -#if defined(WIN32) && !defined(WXPORT) +#if defined(WIN32) LuaContextInfo& info = GetCurrentInfo(); map::iterator it = info.menuData.menuItemMap.begin(); while(it != info.menuData.menuItemMap.end()) @@ -3948,7 +3948,7 @@ DEFINE_LUA_FUNCTION(sound_clear, "") return 0; } -#if defined(_WIN32) && !defined(WXPORT) +#if defined(_WIN32) const char* s_keyToName[256] = { NULL, @@ -4062,7 +4062,7 @@ DEFINE_LUA_FUNCTION(input_getcurrentinputstatus, "") { lua_newtable(L); -#if defined(_WIN32) && !defined(WXPORT) +#if defined(_WIN32) // keyboard and mouse button status { extern bool allowBackgroundInput; @@ -5338,7 +5338,7 @@ void StopLuaScript(int uid) for(int i = 0; i < LUAMEMHOOK_COUNT; i++) CalculateMemHookRegions((LuaMemHookType)i); -#if defined(WIN32) && !defined(WXPORT) +#if defined(WIN32) // remove items map::iterator it = info.menuData.menuItemMap.begin(); while(it != info.menuData.menuItemMap.end()) diff --git a/desmume/src/lua-engine.h b/desmume/src/lua-engine.h index e30024648..ba70aac3b 100644 --- a/desmume/src/lua-engine.h +++ b/desmume/src/lua-engine.h @@ -20,7 +20,7 @@ #include "types.h" -#if defined(WIN32) && !defined(WXPORT) +#if defined(WIN32) #include #include #include "resource.h" @@ -110,7 +110,7 @@ private: void CallRegisteredLuaSaveFunctions(int savestateNumber, LuaSaveData& saveData); void CallRegisteredLuaLoadFunctions(int savestateNumber, const LuaSaveData& saveData); -#if defined(WIN32) && !defined(WXPORT) +#if defined(WIN32) typedef HMENU PlatformMenu; // hMenu typedef UINT PlatformMenuItem; // menuId #define MAX_MENU_COUNT (IDC_LUAMENU_RESERVE_END - IDC_LUAMENU_RESERVE_START + 1) diff --git a/desmume/src/movie.cpp b/desmume/src/movie.cpp index 90438014a..8fd308d13 100644 --- a/desmume/src/movie.cpp +++ b/desmume/src/movie.cpp @@ -1020,7 +1020,7 @@ bool mov_loadstate(EMUFILE* fp, int size) if(tempMovieData.guid != currMovieData.guid) { //mbg 8/18/08 - this code can be used to turn the error message into an OK/CANCEL - #if defined(WIN32) && !defined(WXPORT) + #if defined(WIN32) std::string msg = "There is a mismatch between savestate's movie and current movie.\ncurrent: " + currMovieData.guid.toString() + "\nsavestate: " + tempMovieData.guid.toString() + "\n\nThis means that you have loaded a savestate belonging to a different movie than the one you are playing now.\n\nContinue loading this savestate anyway?"; int result = MessageBox(MainWindow->getHWnd(),msg.c_str(),"Error loading savestate",MB_OKCANCEL); if(result == IDCANCEL) diff --git a/desmume/src/path.h b/desmume/src/path.h index b8c581b38..3494d2956 100644 --- a/desmume/src/path.h +++ b/desmume/src/path.h @@ -27,11 +27,7 @@ #include #include "winutil.h" #include "common.h" -#if !defined(WXPORT) #include "resource.h" -#else -#include -#endif /* !WXPORT */ #elif !defined(DESMUME_COCOA) #include #endif /* _WINDOWS */ diff --git a/desmume/src/types.h b/desmume/src/types.h index 7c7ca1c33..75c081032 100644 --- a/desmume/src/types.h +++ b/desmume/src/types.h @@ -38,7 +38,6 @@ #endif #ifdef _WINDOWS - //#define HAVE_WX //not useful yet.... #define HAVE_LIBAGG #define ENABLE_SSE #define ENABLE_SSE2 diff --git a/desmume/src/version.cpp b/desmume/src/version.cpp index a51e93b2f..22d7065c0 100644 --- a/desmume/src/version.cpp +++ b/desmume/src/version.cpp @@ -32,7 +32,7 @@ #endif //todo - everyone will want to support this eventually, i suppose -#if (defined(_WINDOWS) && !defined(WXPORT)) || defined(DESMUME_COCOA) +#if defined(_WINDOWS) || defined(DESMUME_COCOA) #include "svnrev.h" #else #ifdef SVN_REV diff --git a/desmume/src/wifi.cpp b/desmume/src/wifi.cpp index a87ed525e..4a15b0b08 100644 --- a/desmume/src/wifi.cpp +++ b/desmume/src/wifi.cpp @@ -29,9 +29,7 @@ #include #define socket_t SOCKET #define sockaddr_t SOCKADDR - #ifndef WXPORT - #include "windriver.h" - #endif + #include "windriver.h" #define PCAP_DEVICE_NAME description #else #include diff --git a/desmume/src/windows/DeSmuME_2008.vcproj b/desmume/src/windows/DeSmuME_2008.vcproj index c46d51e05..24d2c37d6 100644 --- a/desmume/src/windows/DeSmuME_2008.vcproj +++ b/desmume/src/windows/DeSmuME_2008.vcproj @@ -1814,18 +1814,6 @@ - - - - - - diff --git a/desmume/src/windows/DeSmuME_2010.vcxproj b/desmume/src/windows/DeSmuME_2010.vcxproj index 263d04a24..33cd015d5 100644 --- a/desmume/src/windows/DeSmuME_2010.vcxproj +++ b/desmume/src/windows/DeSmuME_2010.vcxproj @@ -520,7 +520,6 @@ - @@ -800,7 +799,6 @@ - @@ -978,26 +976,6 @@ .libs\lua.tag; 7z.exe;un7z_and_touch.bat - - call un7z_and_touch.bat wx\wx.7z .libs\wx* - - 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) - .libs\wx.tag;%(Outputs) - call un7z_and_touch.bat wx\wx.7z .libs\wx* - 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) - .libs\wx.tag;%(Outputs) - call un7z_and_touch.bat wx\wx.7z .libs\wx* - - 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) - .libs\wx.tag;%(Outputs) - call un7z_and_touch.bat wx\wx.7z .libs\wx* - - 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) - .libs\wx.tag;%(Outputs) - call un7z_and_touch.bat wx\wx.7z .libs\wx* - 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) - .libs\wx.tag;%(Outputs) - @@ -1020,4 +998,4 @@ - \ No newline at end of file + diff --git a/desmume/src/windows/DeSmuME_2010.vcxproj.filters b/desmume/src/windows/DeSmuME_2010.vcxproj.filters index 201a3dc6c..610e6e85e 100644 --- a/desmume/src/windows/DeSmuME_2010.vcxproj.filters +++ b/desmume/src/windows/DeSmuME_2010.vcxproj.filters @@ -25,9 +25,6 @@ {e51fc8a7-4240-4b5c-8c2a-86c30fef95c9} - - {358afabc-ec55-4449-b901-ea3e999a26d8} - {56813aa6-2261-4011-8938-105c0b4b3773} @@ -273,9 +270,6 @@ Core\metaspu\SoundTouch - - Core\wxdlg - Windows @@ -1013,9 +1007,6 @@ Core\metaspu\SoundTouch - - Core\wxdlg - Windows @@ -1617,8 +1608,5 @@ Windows\libs - - Windows\libs - - \ No newline at end of file + diff --git a/desmume/src/windows/DeSmuME_2012.vcxproj b/desmume/src/windows/DeSmuME_2012.vcxproj index f979f7aaa..97c62d163 100644 --- a/desmume/src/windows/DeSmuME_2012.vcxproj +++ b/desmume/src/windows/DeSmuME_2012.vcxproj @@ -531,7 +531,6 @@ - @@ -811,7 +810,6 @@ - @@ -989,26 +987,6 @@ .libs\lua.tag; 7z.exe;un7z_and_touch.bat - - call un7z_and_touch.bat wx\wx.7z .libs\wx* - - 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) - .libs\wx.tag;%(Outputs) - call un7z_and_touch.bat wx\wx.7z .libs\wx* - 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) - .libs\wx.tag;%(Outputs) - call un7z_and_touch.bat wx\wx.7z .libs\wx* - - 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) - .libs\wx.tag;%(Outputs) - call un7z_and_touch.bat wx\wx.7z .libs\wx* - - 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) - .libs\wx.tag;%(Outputs) - call un7z_and_touch.bat wx\wx.7z .libs\wx* - 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) - .libs\wx.tag;%(Outputs) - @@ -1031,4 +1009,4 @@ - \ No newline at end of file + diff --git a/desmume/src/windows/DeSmuME_2012.vcxproj.filters b/desmume/src/windows/DeSmuME_2012.vcxproj.filters index 143ce26c7..2f7abbe82 100644 --- a/desmume/src/windows/DeSmuME_2012.vcxproj.filters +++ b/desmume/src/windows/DeSmuME_2012.vcxproj.filters @@ -40,9 +40,6 @@ {46c55ff6-0bd2-4715-ba89-aead8b466220} - - {d089f491-2c1b-4006-9f3d-d23ab756613f} - {841d24f1-7f40-48a3-bde6-d546d7903ade} @@ -441,9 +438,6 @@ Core\metaspu\SoundTouch - - Core\wxdlg - Core\filter @@ -1194,9 +1188,6 @@ Core\metaspu\SoundTouch - - Core\wxdlg - Core\filter @@ -1455,8 +1446,5 @@ Windows\libs - - Windows\libs - - \ No newline at end of file + diff --git a/desmume/src/windows/config.h b/desmume/src/windows/config.h index 4e595bcd4..fbf96dd8e 100644 --- a/desmume/src/windows/config.h +++ b/desmume/src/windows/config.h @@ -1,8 +1,6 @@ #ifndef _CONFIG_H #define _CONFIG_H -#if !defined(WXPORT) #include "userconfig.h" -#endif #endif diff --git a/desmume/wxwin.m4 b/desmume/wxwin.m4 deleted file mode 100644 index 52c55e2e6..000000000 --- a/desmume/wxwin.m4 +++ /dev/null @@ -1,366 +0,0 @@ -dnl --------------------------------------------------------------------------- -dnl Macros for wxWidgets detection. Typically used in configure.in as: -dnl -dnl AC_ARG_ENABLE(...) -dnl AC_ARG_WITH(...) -dnl ... -dnl AM_OPTIONS_WXCONFIG -dnl ... -dnl ... -dnl AM_PATH_WXCONFIG(2.6.0, wxWin=1) -dnl if test "$wxWin" != 1; then -dnl AC_MSG_ERROR([ -dnl wxWidgets must be installed on your system -dnl but wx-config script couldn't be found. -dnl -dnl Please check that wx-config is in path, the directory -dnl where wxWidgets libraries are installed (returned by -dnl 'wx-config --libs' command) is in LD_LIBRARY_PATH or -dnl equivalent variable and wxWidgets version is 2.3.4 or above. -dnl ]) -dnl fi -dnl CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" -dnl CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY" -dnl CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" -dnl -dnl LIBS="$LIBS $WX_LIBS" -dnl --------------------------------------------------------------------------- - -dnl --------------------------------------------------------------------------- -dnl AM_OPTIONS_WXCONFIG -dnl -dnl adds support for --wx-prefix, --wx-exec-prefix, --with-wxdir and -dnl --wx-config command line options -dnl --------------------------------------------------------------------------- - -AC_DEFUN([AM_OPTIONS_WXCONFIG], -[ - AC_ARG_WITH(wxdir, - [ --with-wxdir=PATH Use uninstalled version of wxWidgets in PATH], - [ wx_config_name="$withval/wx-config" - wx_config_args="--inplace"]) - AC_ARG_WITH(wx-config, - [ --with-wx-config=CONFIG wx-config script to use (optional)], - wx_config_name="$withval" ) - AC_ARG_WITH(wx-prefix, - [ --with-wx-prefix=PREFIX Prefix where wxWidgets is installed (optional)], - wx_config_prefix="$withval", wx_config_prefix="") - AC_ARG_WITH(wx-exec-prefix, - [ --with-wx-exec-prefix=PREFIX - Exec prefix where wxWidgets is installed (optional)], - wx_config_exec_prefix="$withval", wx_config_exec_prefix="") -]) - -dnl Helper macro for checking if wx version is at least $1.$2.$3, set's -dnl wx_ver_ok=yes if it is: -AC_DEFUN([_WX_PRIVATE_CHECK_VERSION], -[ - wx_ver_ok="" - if test "x$WX_VERSION" != x ; then - if test $wx_config_major_version -gt $1; then - wx_ver_ok=yes - else - if test $wx_config_major_version -eq $1; then - if test $wx_config_minor_version -gt $2; then - wx_ver_ok=yes - else - if test $wx_config_minor_version -eq $2; then - if test $wx_config_micro_version -ge $3; then - wx_ver_ok=yes - fi - fi - fi - fi - fi - fi -]) - -dnl --------------------------------------------------------------------------- -dnl AM_PATH_WXCONFIG(VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND -dnl [, WX-LIBS [, ADDITIONAL-WX-CONFIG-FLAGS]]]]) -dnl -dnl Test for wxWidgets, and define WX_C*FLAGS, WX_LIBS and WX_LIBS_STATIC -dnl (the latter is for static linking against wxWidgets). Set WX_CONFIG_NAME -dnl environment variable to override the default name of the wx-config script -dnl to use. Set WX_CONFIG_PATH to specify the full path to wx-config - in this -dnl case the macro won't even waste time on tests for its existence. -dnl -dnl Optional WX-LIBS argument contains comma- or space-separated list of -dnl wxWidgets libraries to link against (it may include contrib libraries). If -dnl it is not specified then WX_LIBS and WX_LIBS_STATIC will contain flags to -dnl link with all of the core wxWidgets libraries. -dnl -dnl Optional ADDITIONAL-WX-CONFIG-FLAGS argument is appended to wx-config -dnl invocation command in present. It can be used to fine-tune lookup of -dnl best wxWidgets build available. -dnl -dnl Example use: -dnl AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], [html,core,net] -dnl [--unicode --debug]) -dnl --------------------------------------------------------------------------- - -dnl -dnl Get the cflags and libraries from the wx-config script -dnl -AC_DEFUN([AM_PATH_WXCONFIG], -[ - dnl do we have wx-config name: it can be wx-config or wxd-config or ... - if test x${WX_CONFIG_NAME+set} != xset ; then - WX_CONFIG_NAME=wx-config - fi - - if test "x$wx_config_name" != x ; then - WX_CONFIG_NAME="$wx_config_name" - fi - - dnl deal with optional prefixes - if test x$wx_config_exec_prefix != x ; then - wx_config_args="$wx_config_args --exec-prefix=$wx_config_exec_prefix" - WX_LOOKUP_PATH="$wx_config_exec_prefix/bin" - fi - if test x$wx_config_prefix != x ; then - wx_config_args="$wx_config_args --prefix=$wx_config_prefix" - WX_LOOKUP_PATH="$WX_LOOKUP_PATH:$wx_config_prefix/bin" - fi - if test "$cross_compiling" = "yes"; then - wx_config_args="$wx_config_args --host=$host_alias" - fi - - dnl don't search the PATH if WX_CONFIG_NAME is absolute filename - if test -x "$WX_CONFIG_NAME" ; then - AC_MSG_CHECKING(for wx-config) - WX_CONFIG_PATH="$WX_CONFIG_NAME" - AC_MSG_RESULT($WX_CONFIG_PATH) - else - AC_PATH_PROG(WX_CONFIG_PATH, $WX_CONFIG_NAME, no, "$WX_LOOKUP_PATH:$PATH") - fi - - if test "$WX_CONFIG_PATH" != "no" ; then - WX_VERSION="" - - min_wx_version=ifelse([$1], ,2.2.1,$1) - if test -z "$5" ; then - AC_MSG_CHECKING([for wxWidgets version >= $min_wx_version]) - else - AC_MSG_CHECKING([for wxWidgets version >= $min_wx_version ($5)]) - fi - - WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args $5 $4" - - WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null` - wx_config_major_version=`echo $WX_VERSION | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - wx_config_minor_version=`echo $WX_VERSION | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - wx_config_micro_version=`echo $WX_VERSION | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - - wx_requested_major_version=`echo $min_wx_version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - wx_requested_minor_version=`echo $min_wx_version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - wx_requested_micro_version=`echo $min_wx_version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - - _WX_PRIVATE_CHECK_VERSION([$wx_requested_major_version], - [$wx_requested_minor_version], - [$wx_requested_micro_version]) - - if test -n "$wx_ver_ok"; then - - AC_MSG_RESULT(yes (version $WX_VERSION)) - WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs` - - dnl is this even still appropriate? --static is a real option now - dnl and WX_CONFIG_WITH_ARGS is likely to contain it if that is - dnl what the user actually wants, making this redundant at best. - dnl For now keep it in case anyone actually used it in the past. - AC_MSG_CHECKING([for wxWidgets static library]) - WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs 2>/dev/null` - if test "x$WX_LIBS_STATIC" = "x"; then - AC_MSG_RESULT(no) - else - AC_MSG_RESULT(yes) - fi - - dnl starting with version 2.2.6 wx-config has --cppflags argument - wx_has_cppflags="" - if test $wx_config_major_version -gt 2; then - wx_has_cppflags=yes - else - if test $wx_config_major_version -eq 2; then - if test $wx_config_minor_version -gt 2; then - wx_has_cppflags=yes - else - if test $wx_config_minor_version -eq 2; then - if test $wx_config_micro_version -ge 6; then - wx_has_cppflags=yes - fi - fi - fi - fi - fi - - dnl starting with version 2.7.0 wx-config has --rescomp option - wx_has_rescomp="" - if test $wx_config_major_version -gt 2; then - wx_has_rescomp=yes - else - if test $wx_config_major_version -eq 2; then - if test $wx_config_minor_version -ge 7; then - wx_has_rescomp=yes - fi - fi - fi - if test "x$wx_has_rescomp" = x ; then - dnl cannot give any useful info for resource compiler - WX_RESCOMP= - else - WX_RESCOMP=`$WX_CONFIG_WITH_ARGS --rescomp` - fi - - if test "x$wx_has_cppflags" = x ; then - dnl no choice but to define all flags like CFLAGS - WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags` - WX_CPPFLAGS=$WX_CFLAGS - WX_CXXFLAGS=$WX_CFLAGS - - WX_CFLAGS_ONLY=$WX_CFLAGS - WX_CXXFLAGS_ONLY=$WX_CFLAGS - else - dnl we have CPPFLAGS included in CFLAGS included in CXXFLAGS - WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags` - WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags` - WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags` - - WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"` - WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"` - fi - - ifelse([$2], , :, [$2]) - - else - - if test "x$WX_VERSION" = x; then - dnl no wx-config at all - AC_MSG_RESULT(no) - else - AC_MSG_RESULT(no (version $WX_VERSION is not new enough)) - fi - - WX_CFLAGS="" - WX_CPPFLAGS="" - WX_CXXFLAGS="" - WX_LIBS="" - WX_LIBS_STATIC="" - WX_RESCOMP="" - ifelse([$3], , :, [$3]) - - fi - else - - WX_CFLAGS="" - WX_CPPFLAGS="" - WX_CXXFLAGS="" - WX_LIBS="" - WX_LIBS_STATIC="" - WX_RESCOMP="" - - ifelse([$3], , :, [$3]) - - fi - - AC_SUBST(WX_CPPFLAGS) - AC_SUBST(WX_CFLAGS) - AC_SUBST(WX_CXXFLAGS) - AC_SUBST(WX_CFLAGS_ONLY) - AC_SUBST(WX_CXXFLAGS_ONLY) - AC_SUBST(WX_LIBS) - AC_SUBST(WX_LIBS_STATIC) - AC_SUBST(WX_VERSION) - AC_SUBST(WX_RESCOMP) -]) - -dnl --------------------------------------------------------------------------- -dnl Get information on the wxrc program for making C++, Python and xrs -dnl resource files. -dnl -dnl AC_ARG_ENABLE(...) -dnl AC_ARG_WITH(...) -dnl ... -dnl AM_OPTIONS_WXCONFIG -dnl ... -dnl AM_PATH_WXCONFIG(2.6.0, wxWin=1) -dnl if test "$wxWin" != 1; then -dnl AC_MSG_ERROR([ -dnl wxWidgets must be installed on your system -dnl but wx-config script couldn't be found. -dnl -dnl Please check that wx-config is in path, the directory -dnl where wxWidgets libraries are installed (returned by -dnl 'wx-config --libs' command) is in LD_LIBRARY_PATH or -dnl equivalent variable and wxWidgets version is 2.6.0 or above. -dnl ]) -dnl fi -dnl -dnl AM_PATH_WXRC([HAVE_WXRC=1], [HAVE_WXRC=0]) -dnl if test "x$HAVE_WXRC" != x1; then -dnl AC_MSG_ERROR([ -dnl The wxrc program was not installed or not found. -dnl -dnl Please check the wxWidgets installation. -dnl ]) -dnl fi -dnl -dnl CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" -dnl CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY" -dnl CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" -dnl -dnl LDFLAGS="$LDFLAGS $WX_LIBS" -dnl --------------------------------------------------------------------------- - - - -dnl --------------------------------------------------------------------------- -dnl AM_PATH_WXRC([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) -dnl -dnl Test for wxWidgets' wxrc program for creating either C++, Python or XRS -dnl resources. The variable WXRC will be set and substituted in the configure -dnl script and Makefiles. -dnl -dnl Example use: -dnl AM_PATH_WXRC([wxrc=1], [wxrc=0]) -dnl --------------------------------------------------------------------------- - -dnl -dnl wxrc program from the wx-config script -dnl -AC_DEFUN([AM_PATH_WXRC], -[ - AC_ARG_VAR([WXRC], [Path to wxWidget's wxrc resource compiler]) - - if test "x$WX_CONFIG_NAME" = x; then - AC_MSG_ERROR([The wxrc tests must run after wxWidgets test.]) - else - - AC_MSG_CHECKING([for wxrc]) - - if test "x$WXRC" = x ; then - dnl wx-config --utility is a new addition to wxWidgets: - _WX_PRIVATE_CHECK_VERSION(2,5,3) - if test -n "$wx_ver_ok"; then - WXRC=`$WX_CONFIG_WITH_ARGS --utility=wxrc` - fi - fi - - if test "x$WXRC" = x ; then - AC_MSG_RESULT([not found]) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT([$WXRC]) - ifelse([$1], , :, [$1]) - fi - - AC_SUBST(WXRC) - fi -])